Mercurial > hg

log tests/test-rename-merge1.t @ 49407:23dd636852b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
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
Wed, 26 Dec 2012 15:03:58 -0800 Siddharth Agarwal copies: make debug messages more sensible
Wed, 11 Jul 2012 15:03:10 -0700 Bryan O'Sullivan tests: reduce spurious failures when run with generaldelta
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
Wed, 23 May 2012 20:50:16 +0200 Thomas Arendsen Hein merge: warn about file deleted in one branch and renamed in other (issue3074)
Wed, 23 May 2012 17:33:19 +0200 Thomas Arendsen Hein tests: do not create repos inside repos in test-rename-merge1.t
Wed, 23 May 2012 17:25:48 +0200 Thomas Arendsen Hein merge: do not warn about copy and rename in the same transaction (issue2113)
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Wed, 04 May 2011 13:37:41 +0200 Sune Foldager tests: fix deprecated use of hg debugdata/debugindex
Sun, 06 Mar 2011 10:06:09 +0100 Patrick Mezard test-rename-merge1: make it easier to review, windows friendly
Thu, 24 Feb 2011 13:57:52 -0300 Wagner Bruna tests: test renaming a file added on two branches (issue2089) stable
Wed, 23 Feb 2011 17:27:05 -0600 Matt Mackall context: generate file ancestors in reverse revision order (issue2642) stable
Sun, 10 Oct 2010 09:50:25 -0500 Dan Villiom Podlaski Christiansen merge: make 'diverging renames' diagnostic a more helpful note.
Sun, 10 Oct 2010 09:48:37 -0500 Dan Villiom Podlaski Christiansen copies: don't detect copies as "divergent renames"
Tue, 14 Sep 2010 13:43:05 +0200 Adrian Buehlmann tests: unify test-rename-merge1 base tests/test-rename-merge1@957ba3496c7a
less more | (0) tip