| Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
file |
diff |
annotate
|
| Wed, 22 Jan 2020 13:29:26 -0800 |
Martin von Zweigbergk |
merge: when rename was made on both sides, use ancestor as merge base
|
file |
diff |
annotate
|
| Fri, 24 Jan 2020 10:39:55 -0800 |
Martin von Zweigbergk |
copies: print debug information about copies per side/branch
|
file |
diff |
annotate
|
| Tue, 28 Jan 2020 22:03:00 -0500 |
Matt Harbison |
tests: stablize test-rename-merge1.t on Windows
|
file |
diff |
annotate
|
| Fri, 24 Jan 2020 07:00:45 -0800 |
Martin von Zweigbergk |
tests: test merge of renames of different sources to same target
|
file |
diff |
annotate
|
| Fri, 21 Jun 2019 16:59:29 -0700 |
Martin von Zweigbergk |
tests: add more tests of copy tracing with removed and re-added files
|
file |
diff |
annotate
|
| Mon, 29 Apr 2019 14:38:54 -0700 |
Martin von Zweigbergk |
tests: add test where copy source is deleted and added back
|
file |
diff |
annotate
|
| Thu, 18 Apr 2019 22:23:26 -0700 |
Martin von Zweigbergk |
tests: avoid cryptic nodeids in tests/test-rename-merge1.t
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
file |
diff |
annotate
|
| Fri, 12 Apr 2019 09:41:08 -0700 |
Martin von Zweigbergk |
copies: print list of divergent renames in sorted order
|
file |
diff |
annotate
|
| Mon, 02 Apr 2018 16:47:53 -0700 |
Gregory Szorc |
debugcommands: drop offset and length from debugindex by default
|
file |
diff |
annotate
|
| Mon, 02 Apr 2018 16:28:20 -0700 |
Gregory Szorc |
debugcommands: drop base revision from debugindex
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
file |
diff |
annotate
|
| Thu, 12 Nov 2015 13:14:03 -0800 |
Martin von Zweigbergk |
merge: move messages about possible conflicts a litte earlier
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
file |
diff |
annotate
|
| Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
file |
diff |
annotate
|
| 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
|