log tests/test-rename-dir-merge.t @ 25651:125c11ec7bee

age author description
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