tests/test-rename-merge1.t
Fri, 18 Nov 2022 13:47:29 +0000 Arseniy Alekseyev tests: run many tests in $TESTTMP/repo instead of $TESTTMP stable
Wed, 01 Jun 2022 01:13:13 +0200 Pierre-Yves DAVID debugindex: rename the parent column to mention nodeid
Wed, 01 Jun 2022 00:59:51 +0200 Pierre-Yves David debugindex: align column name on the right
Thu, 02 Dec 2021 22:59:36 -0800 Martin von Zweigbergk mergestate: merge `preresolve()` into `resolve()`
Mon, 07 Dec 2020 20:32:05 -0500 Matt Harbison tests: correct the output order about starting a background thread for Windows
Thu, 03 Sep 2020 13:25:29 +0530 Pulkit Goyal merge: move initial handling of mergeactions near to later one
Wed, 22 Jan 2020 13:29:26 -0800 Martin von Zweigbergk merge: when rename was made on both sides, use ancestor as merge base
Fri, 24 Jan 2020 10:39:55 -0800 Martin von Zweigbergk copies: print debug information about copies per side/branch
Tue, 28 Jan 2020 22:03:00 -0500 Matt Harbison tests: stablize test-rename-merge1.t on Windows
Fri, 24 Jan 2020 07:00:45 -0800 Martin von Zweigbergk tests: test merge of renames of different sources to same target
Fri, 21 Jun 2019 16:59:29 -0700 Martin von Zweigbergk tests: add more tests of copy tracing with removed and re-added files
Mon, 29 Apr 2019 14:38:54 -0700 Martin von Zweigbergk tests: add test where copy source is deleted and added back
Thu, 18 Apr 2019 22:23:26 -0700 Martin von Zweigbergk tests: avoid cryptic nodeids in tests/test-rename-merge1.t
Thu, 11 Apr 2019 23:28:38 -0700 Martin von Zweigbergk copies: delete debug message about search limit
Fri, 12 Apr 2019 09:41:08 -0700 Martin von Zweigbergk copies: print list of divergent renames in sorted order
Mon, 02 Apr 2018 16:47:53 -0700 Gregory Szorc debugcommands: drop offset and length from debugindex by default
Mon, 02 Apr 2018 16:28:20 -0700 Gregory Szorc debugcommands: drop base revision from debugindex
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Thu, 12 Nov 2015 13:14:03 -0800 Martin von Zweigbergk merge: move messages about possible conflicts a litte earlier
Sun, 11 Oct 2015 21:56:39 -0700 Siddharth Agarwal merge.mergestate: perform all premerges before any merges (BC)
Wed, 07 Oct 2015 00:01:16 -0700 Siddharth Agarwal filemerge: normalize 'internal:foo' names to ':foo'
Sat, 09 May 2015 23:40:40 -0700 Pierre-Yves David progress: get the extremely verbose output out of default debug
Fri, 05 Dec 2014 16:13:26 -0800 Martin von Zweigbergk merge: don't report progress for dr/rd actions
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes
Fri, 02 May 2014 01:09:14 +0200 Mads Kiilerich merge: change priority / ordering of merge actions
Sun, 02 Mar 2014 18:52:16 +0100 Mads Kiilerich merge: keep destination filename as key in filemerge actions
Sat, 09 Feb 2013 15:22:04 -0800 Bryan O'Sullivan tests: update test output (will be folded into parent)
Fri, 08 Feb 2013 15:23:23 +0000 Siddharth Agarwal manifestmerge: pass in branchmerge and force separately
Thu, 24 Jan 2013 23:57:44 +0100 Mads Kiilerich merge: delay debug messages for merge actions
Wed, 12 Dec 2012 02:38:14 +0100 Mads Kiilerich copies: report found copies sorted
less more (0) -30 tip