Log of /svnmerge

---

Revision 63 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 24 19:58:12 2006 UTC (2 years ago) by kpfleming
File length: 47891 byte(s)
Diff to previous 45

simplify merging process, will hopefully produce fewer pointless conflicts

---

Revision 45 - (view) (download) (annotate) - [select for diffs]
Modified Thu Feb 9 02:47:16 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 47873 byte(s)
Diff to previous 44

fix typo

---

Revision 44 - (view) (download) (annotate) - [select for diffs]
Modified Thu Feb 9 02:45:54 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 47873 byte(s)
Diff to previous 36

support -P in block/unblock ops

---

Revision 36 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 6 03:08:44 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 47861 byte(s)
Diff to previous 32

update to revision 18345 of upstream

---

Revision 32 - (view) (download) (annotate) - [select for diffs]
Modified Fri Feb 3 00:21:20 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 47106 byte(s)
Diff to previous 30

more fixes for automerge

---

Revision 30 - (view) (download) (annotate) - [select for diffs]
Modified Thu Feb 2 23:46:32 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 47106 byte(s)
Diff to previous 27

allow blocked property specification for 'avail' and 'merge' too

---

Revision 27 - (view) (download) (annotate) - [select for diffs]
Modified Thu Feb 2 23:35:20 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 47094 byte(s)
Diff to previous 18

allow command-line control of the property names for merging/blocking

---

Revision 18 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 24 23:02:43 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 46742 byte(s)
Diff to previous 6

don't try to run the same function twice on the properties

---

Revision 6 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 17 17:28:10 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 46762 byte(s)
Diff to previous 5

support different return values, and return '2' when 'avail' has nothing to merge

---

Revision 5 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 17 17:15:50 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 46643 byte(s)
Diff to previous 4

don't require a working copy for the 'avail' command

---

Revision 4 - (view) (download) (annotate) - [select for diffs]
Modified Tue Jan 17 17:06:31 2006 UTC (2 years, 3 months ago) by kpfleming
File length: 46412 byte(s)
Diff to previous 1

update to revision 18013 of upstream repository

---

Revision 1 - (view) (download) (annotate) - [select for diffs]
Added Tue Dec 6 22:36:36 2005 UTC (2 years, 5 months ago) by kpfleming
File length: 43833 byte(s)

add various tools and files used for managing repositories