Mercurial > hg

log tests/test-rename-merge2.t @ 49321:c12c843f0db7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 03 Dec 2021 21:41:43 -0800 Martin von Zweigbergk filemerge: make `_filemerge()` do both premerge and merge
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
Mon, 24 Feb 2020 16:59:35 -0500 Matt Harbison tests: stabilize test-rename-merge2.t on Windows
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
Thu, 20 Jun 2019 11:40:47 -0700 Kyle Lippincott filemerge: make last line of prompts <40 english chars (issue6158)
Thu, 11 Apr 2019 23:22:54 -0700 Martin von Zweigbergk copies: calculate mergecopies() based on pathcopies()
Mon, 15 Apr 2019 14:09:18 -0700 Martin von Zweigbergk copies: delete debug message about "unmatched files new in both"
Thu, 11 Apr 2019 23:28:38 -0700 Martin von Zweigbergk copies: delete debug message about search limit
Mon, 15 Apr 2019 16:41:43 -0700 Martin von Zweigbergk copies: fix up "fullcopy" with missing entries from "copy"
Mon, 15 Apr 2019 15:28:41 -0700 Martin von Zweigbergk tests: delete unused function in test-rename-merge2.t
Tue, 18 Sep 2018 23:47:21 -0400 Matt Harbison tests: quote PYTHON usage
Tue, 04 Sep 2018 17:33:22 +0300 Pulkit Goyal py3: write the file in str mode in tests/test-rename-merge2.t
Sun, 26 Aug 2018 19:14:26 +0300 Pulkit Goyal filemerge: fix the wrong placements of messages in prompt
Sat, 25 Aug 2018 21:17:34 +0300 Pulkit Goyal filemerge: print the filename in quotes in prompt
Mon, 20 Aug 2018 13:29:48 -0400 Augie Fackler merge: improve interactive one-changed one-deleted message (issue5550)
Mon, 08 Jan 2018 19:41:47 +0530 Pulkit Goyal merge: add `--abort` flag which can abort the merge
Tue, 20 Jun 2017 17:31:18 -0400 Augie Fackler tests: clean up even more direct `python` calls with $PYTHON
Wed, 03 May 2017 10:43:59 -0700 Durham Goode rebase: use matcher to optimize manifestmerge
Fri, 07 Oct 2016 08:51:50 -0700 Simon Farnsworth merge: add conflict labels to merge command
Tue, 20 Sep 2016 23:48:08 +0000 timeless localrepo: use single quotes in use warning
Fri, 12 Aug 2016 05:56:40 -0700 Simon Farnsworth merge: always use other, not remote, in user prompts
Mon, 29 Feb 2016 01:01:20 -0500 Matt Harbison tests: flag Windows specific lines about background closing as optional
Wed, 23 Dec 2015 12:51:45 -0800 Siddharth Agarwal filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Mon, 30 Nov 2015 13:43:55 -0800 Siddharth Agarwal filemerge: add a 'leave unresolved' option to change/delete prompts
Wed, 25 Nov 2015 14:25:26 -0800 Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict
Wed, 25 Nov 2015 14:25:33 -0800 Siddharth Agarwal merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Mon, 30 Nov 2015 10:19:39 -0800 Siddharth Agarwal merge: add a new action type representing files to add/mark as modified
Wed, 11 Feb 2015 22:22:29 -0800 Martin von Zweigbergk test-rename-merge2: make selected output less arbitrary
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)
Sun, 11 Oct 2015 20:47:14 -0700 Siddharth Agarwal filemerge: break overall filemerge into separate premerge and merge steps
Sat, 09 May 2015 23:40:40 -0700 Pierre-Yves David progress: get the extremely verbose output out of default debug
Wed, 29 Apr 2015 21:14:59 -0400 Matt Harbison windows: make shellquote() quote any path containing '\' (issue4629) stable
Fri, 17 Apr 2015 12:39:55 -0400 Matt Harbison test-rename-merge2: fix test failure on Windows stable
Thu, 19 Mar 2015 22:22:50 +0100 Mads Kiilerich merge: better debug messages before/after invoking external merge tool
Fri, 05 Dec 2014 16:13:26 -0800 Martin von Zweigbergk merge: don't report progress for dr/rd actions
Wed, 03 Dec 2014 14:03:20 -0800 Martin von Zweigbergk merge: make 'keep' message more descriptive
Mon, 24 Nov 2014 16:42:36 -0800 Martin von Zweigbergk merge: break out "both renamed a -> b" case
Mon, 24 Nov 2014 16:16:34 -0800 Martin von Zweigbergk merge: separate out "both created" cases
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
Mon, 07 Apr 2014 02:12:28 +0200 Mads Kiilerich merge: let manifestmerge emit 'keep' actions when keeping wd version
Sun, 13 Apr 2014 19:01:00 +0200 Mads Kiilerich spelling: fixes from spell checker
Sun, 02 Mar 2014 18:52:16 +0100 Mads Kiilerich merge: keep destination filename as key in filemerge actions
Tue, 25 Feb 2014 20:29:14 +0100 Mads Kiilerich copies: when both sides made the same copy, report it as a copy
Tue, 25 Feb 2014 20:28:40 +0100 Mads Kiilerich tests: add systematic test of merge ancestor calculation
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
Mon, 04 Feb 2013 02:46:53 +0100 Mads Kiilerich merge: don't indent "local changed %s which remote deleted" prompt
Thu, 24 Jan 2013 23:57:44 +0100 Mads Kiilerich merge: delay debug messages for merge actions
Thu, 24 Jan 2013 23:57:44 +0100 Mads Kiilerich merge: delay prompts a bit and show them in (extra) sorted order
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
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
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Tue, 19 Apr 2011 12:04:44 +0200 Martin Geisler tests: remove redundant mkdir
Tue, 19 Oct 2010 22:33:52 -0500 Steve Borho merge: implement --tool arguments using new ui.forcemerge configurable
Sun, 10 Oct 2010 09:50:25 -0500 Dan Villiom Podlaski Christiansen merge: make 'diverging renames' diagnostic a more helpful note.
Sat, 16 Oct 2010 18:09:01 +0200 Adrian Buehlmann check-code: add 'no tab indent' check for unified tests
Sun, 26 Sep 2010 13:44:49 -0500 Matt Mackall tests: unify test-rename-merge2 base tests/test-rename-merge2@8a1e405cec26
less more | (0) tip