| Fri, 05 Dec 2014 16:13:26 -0800 |
Martin von Zweigbergk |
merge: don't report progress for dr/rd actions
|
file |
diff |
annotate
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
file |
diff |
annotate
|
| Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: change priority / ordering of merge actions
|
file |
diff |
annotate
|
| Sun, 02 Mar 2014 18:52:16 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in filemerge actions
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:22:04 -0800 |
Bryan O'Sullivan |
tests: update test output (will be folded into parent)
|
file |
diff |
annotate
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
file |
diff |
annotate
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
file |
diff |
annotate
|
| Wed, 12 Dec 2012 02:38:14 +0100 |
Mads Kiilerich |
copies: report found copies sorted
|
file |
diff |
annotate
|
| Wed, 26 Dec 2012 15:03:58 -0800 |
Siddharth Agarwal |
copies: make debug messages more sensible
|
file |
diff |
annotate
|
| Wed, 11 Jul 2012 15:03:10 -0700 |
Bryan O'Sullivan |
tests: reduce spurious failures when run with generaldelta
|
file |
diff |
annotate
|
| Wed, 23 May 2012 21:34:29 +0200 |
Thomas Arendsen Hein |
merge: show renamed on one and deleted on the other side in debug output
|
file |
diff |
annotate
|
| Wed, 23 May 2012 20:50:16 +0200 |
Thomas Arendsen Hein |
merge: warn about file deleted in one branch and renamed in other (issue3074)
|
file |
diff |
annotate
|
| Wed, 23 May 2012 17:33:19 +0200 |
Thomas Arendsen Hein |
tests: do not create repos inside repos in test-rename-merge1.t
|
file |
diff |
annotate
|
| Wed, 23 May 2012 17:25:48 +0200 |
Thomas Arendsen Hein |
merge: do not warn about copy and rename in the same transaction (issue2113)
|
file |
diff |
annotate
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
file |
diff |
annotate
|
| Wed, 04 May 2011 13:37:41 +0200 |
Sune Foldager |
tests: fix deprecated use of hg debugdata/debugindex
|
file |
diff |
annotate
|
| Sun, 06 Mar 2011 10:06:09 +0100 |
Patrick Mezard |
test-rename-merge1: make it easier to review, windows friendly
|
file |
diff |
annotate
|
| Thu, 24 Feb 2011 13:57:52 -0300 |
Wagner Bruna |
tests: test renaming a file added on two branches (issue2089)
stable
|
file |
diff |
annotate
|
| Wed, 23 Feb 2011 17:27:05 -0600 |
Matt Mackall |
context: generate file ancestors in reverse revision order (issue2642)
stable
|
file |
diff |
annotate
|
| Sun, 10 Oct 2010 09:50:25 -0500 |
Dan Villiom Podlaski Christiansen |
merge: make 'diverging renames' diagnostic a more helpful note.
|
file |
diff |
annotate
|
| Sun, 10 Oct 2010 09:48:37 -0500 |
Dan Villiom Podlaski Christiansen |
copies: don't detect copies as "divergent renames"
|
file |
diff |
annotate
|
| Tue, 14 Sep 2010 13:43:05 +0200 |
Adrian Buehlmann |
tests: unify test-rename-merge1
|
file |
diff |
annotate
| base
|