log tests/test-rename-dir-merge.t @ 48393:1a8a70b4b0ad

age author description
Tue, 09 Nov 2021 19:55:46 +0100 Simon Sapin rhg: Enable `rhg status` in most tests
Thu, 04 Mar 2021 16:06:55 -0800 Martin von Zweigbergk copies: choose target directory based on longest match
Fri, 29 Jan 2021 15:56:08 -0800 Martin von Zweigbergk errors: use StateError more in merge module
Fri, 24 Jan 2020 10:39:55 -0800 Martin von Zweigbergk copies: print debug information about copies per side/branch
Thu, 11 Apr 2019 23:28:38 -0700 Martin von Zweigbergk copies: delete debug message about search limit
Tue, 05 Jun 2018 02:50:25 +0200 Boris Feld phases: use "published" in the phase movement message
Tue, 05 Jun 2018 01:49:52 +0200 Boris Feld phase: clarify the message about movement on command changeset
Thu, 24 May 2018 12:19:50 +0200 Denis Laxalde transaction-summary: show phase changes statistics in pull/unbundle
Mon, 08 Jan 2018 19:41:47 +0530 Pulkit Goyal merge: add `--abort` flag which can abort the merge
Sun, 10 Dec 2017 22:50:57 -0500 Matt Harbison tests: remove (glob) annotations that were only for '\' matches
Thu, 12 Oct 2017 09:39:50 +0200 Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers
Fri, 07 Oct 2016 08:51:50 -0700 Simon Farnsworth merge: add conflict labels to merge command
Mon, 29 Feb 2016 01:01:20 -0500 Matt Harbison tests: flag Windows specific lines about background closing as optional
Wed, 13 Jan 2016 10:10:05 -0600 Matt Mackall copies: fix detection of divergent directory renames
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Sat, 09 May 2015 23:40:40 -0700 Pierre-Yves David progress: get the extremely verbose output out of default debug
Fri, 12 Dec 2014 23:18:36 -0800 Martin von Zweigbergk merge: don't overwrite untracked file at directory rename target
Wed, 03 Dec 2014 11:02:52 -0800 Martin von Zweigbergk merge: don't overwrite conflicting file in locally renamed directory
Wed, 03 Dec 2014 10:56:07 -0800 Martin von Zweigbergk merge: don't ignore conflicting file in remote renamed directory
Wed, 03 Dec 2014 10:01:24 -0800 Martin von Zweigbergk merge: add test with conflicting file and remote directory rename
Tue, 02 Dec 2014 13:28:07 -0800 Martin von Zweigbergk merge: demonstrate that directory renames can lose local file content
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes
Sun, 02 Mar 2014 18:49:36 +0100 Mads Kiilerich merge: keep destination filename as key in actions for merge with dir rename
Fri, 03 May 2013 14:19:30 -0700 Brendan Cully tests: check path separator in moves
Mon, 29 Apr 2013 15:58:15 +0900 FUJIWARA Katsunori merge: increase safety of parallel updating/removing on icasefs stable
Sat, 09 Feb 2013 15:22:10 -0800 Bryan O'Sullivan tests: getremove test output changes (fold into previous patch)
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
Tue, 15 Jan 2013 02:59:12 +0100 Mads Kiilerich merge: process files in sorted order
Wed, 26 Dec 2012 15:03:58 -0800 Siddharth Agarwal copies: make debug messages more sensible
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
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
Thu, 09 Feb 2012 17:04:17 -0600 Matt Mackall merge: don't use unknown()
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Mon, 07 Nov 2011 03:25:10 +0100 Mads Kiilerich tests: make (glob) on windows accept \ instead of /
Tue, 19 Apr 2011 12:04:44 +0200 Martin Geisler tests: remove redundant mkdir
Mon, 30 Aug 2010 13:55:57 +0900 Nicolas Dumazet tests: merge the two test-rename-dir-merge* into one base tests/test-rename-dir-merge@429f28c1d529
Mon, 30 Aug 2010 13:49:40 +0900 Nicolas Dumazet tests: unify test-rename-dir-merge base tests/test-rename-dir-merge@429f28c1d529