| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
file |
diff |
annotate
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
file |
diff |
annotate
|
| Wed, 10 Mar 2021 13:14:32 +0530 |
Pulkit Goyal |
commit: get info from mergestate whether a file was merged or not
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 18:07:21 +0530 |
Pulkit Goyal |
merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 17:51:40 +0530 |
Pulkit Goyal |
tests: fix a typo in `desc()` revset in test-merge-criss-cross.t
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 15:46:54 +0530 |
Pulkit Goyal |
merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
|
file |
diff |
annotate
|
| Mon, 24 Aug 2020 15:35:34 +0530 |
Pulkit Goyal |
merge: store cases when a file is absent post merge in commitinfo
|
file |
diff |
annotate
|
| Mon, 14 Sep 2020 15:08:15 +0530 |
Pulkit Goyal |
tests: add some more debugmergestate calls in `test-merge-criss-cross.t`
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:58:14 +0530 |
Pulkit Goyal |
commit: force create a new filenode if it was set in mergestate by merge
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:44:06 +0530 |
Pulkit Goyal |
merge: store commitinfo if these is a dc or cd conflict
|
file |
diff |
annotate
|
| Mon, 14 Sep 2020 14:11:45 +0530 |
Pulkit Goyal |
tests: add some debugmergestate calls in `test-merge-criss-cross.t`
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:54:46 +0530 |
Pulkit Goyal |
tests: add few debugrevlogindex and a log call to see changes in next test
|
file |
diff |
annotate
|
| Mon, 14 Sep 2020 14:31:23 +0530 |
Pulkit Goyal |
configitems: add a new config option to control new filenode functionality
|
file |
diff |
annotate
|
| Wed, 09 Sep 2020 16:49:19 +0530 |
Pulkit Goyal |
mergestate: introduce a new ACTION_KEEP_NEW
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
file |
diff |
annotate
|
| Mon, 24 Aug 2020 17:22:28 +0530 |
Pulkit Goyal |
merge: add missing ACTION_KEEP when both remote and ancestor are not present
|
file |
diff |
annotate
|
| Mon, 24 Aug 2020 15:20:09 +0530 |
Pulkit Goyal |
merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally
|
file |
diff |
annotate
|
| Fri, 19 Jun 2020 13:27:46 +0200 |
Pierre-Yves David |
tests: add criss cross merging tests whose behavior need to be fixed
|
file |
diff |
annotate
|
| Wed, 26 Aug 2020 17:20:53 +0530 |
Pulkit Goyal |
merge: show list of bids for each file in bid-merge in ui.debug()
|
file |
diff |
annotate
|
| Wed, 26 Aug 2020 17:24:22 +0530 |
Pulkit Goyal |
merge: show number of ancestors in bid merge debug notes
|
file |
diff |
annotate
|
| Fri, 24 Jan 2020 10:39:55 -0800 |
Martin von Zweigbergk |
copies: print debug information about copies per side/branch
|
file |
diff |
annotate
|
| Wed, 22 Jan 2020 15:20:12 -0800 |
Martin von Zweigbergk |
copies: move early return in mergecopies() earlier
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
file |
diff |
annotate
|
| Fri, 12 Apr 2019 22:03:04 -0700 |
Martin von Zweigbergk |
copies: don't include copies that are not in source in directory move
|
file |
diff |
annotate
|
| Sat, 13 Apr 2019 23:18:56 -0700 |
Martin von Zweigbergk |
tests: split out separate test for issue5020
|
file |
diff |
annotate
|
| Tue, 26 Jun 2018 15:26:21 -0700 |
Sean Farley |
revset: add optimization for heads(commonancestors())
|
file |
diff |
annotate
|
| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
file |
diff |
annotate
|
| Sat, 01 Apr 2017 14:48:39 -0400 |
Matt Harbison |
tests: add globs for Windows
|
file |
diff |
annotate
|
| Tue, 31 Jan 2017 03:25:59 +0100 |
Mads Kiilerich |
merge: fix crash on criss cross merge with dir move and delete (issue5020)
stable
|
file |
diff |
annotate
|
| Tue, 31 Jan 2017 03:20:07 +0100 |
Mads Kiilerich |
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
stable
|
file |
diff |
annotate
|
| Tue, 02 Feb 2016 15:24:11 +0000 |
Pierre-Yves David |
update: change default destination to tipmost descendant (issue4673) (BC)
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
file |
diff |
annotate
|
| Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 20:56:53 -0800 |
Martin von Zweigbergk |
merge: let bid merge work on the file->action dict
|
file |
diff |
annotate
|
| Wed, 03 Dec 2014 14:03:20 -0800 |
Martin von Zweigbergk |
merge: make 'keep' message more descriptive
|
file |
diff |
annotate
|
| Wed, 01 Oct 2014 03:42:00 +0200 |
Mads Kiilerich |
merge: mute the status message when bid merge kicks in
|
file |
diff |
annotate
|
| Wed, 01 Oct 2014 03:41:11 +0200 |
Mads Kiilerich |
merge: use bid merge by default (BC)
|
file |
diff |
annotate
|
| Wed, 01 Oct 2014 03:40:51 +0200 |
Mads Kiilerich |
changectx: skip all invalid merge.preferancestor values
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 02:46:44 +0200 |
Mads Kiilerich |
changectx: ancestor should only prefer merge.preferancestor if it is a revision
stable
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 02:39:01 +0200 |
Mads Kiilerich |
merge: show the scary multiple ancestor hint for merges only, not for updates
stable
|
file |
diff |
annotate
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
file |
diff |
annotate
|
| Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: change priority / ordering of merge actions
|
file |
diff |
annotate
|
| Tue, 22 Apr 2014 02:09:24 +0200 |
Mads Kiilerich |
merge: make debug output slightly more helpful by including message for action
|
file |
diff |
annotate
|
| Mon, 21 Apr 2014 20:24:54 +0200 |
Mads Kiilerich |
merge: improve notes for listing the bids for ambiguous merges
stable
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 13:33:20 +0200 |
Mads Kiilerich |
merge: tell the user when we are using bid merge
stable
|
file |
diff |
annotate
|
| Mon, 21 Apr 2014 20:22:14 +0200 |
Mads Kiilerich |
merge: fix stray character in bid merge message
stable
|
file |
diff |
annotate
|
| Mon, 21 Apr 2014 20:18:42 +0200 |
Mads Kiilerich |
tests: better test coverage for bid merge
stable
|
file |
diff |
annotate
|
| Fri, 28 Feb 2014 02:52:32 +0100 |
Mads Kiilerich |
merge: with merge.preferancestor=*, run an auction with bids from ancestors
|
file |
diff |
annotate
|
| Mon, 24 Feb 2014 22:42:14 +0100 |
Mads Kiilerich |
context: introduce merge.preferancestor for controlling which ancestor to pick
|
file |
diff |
annotate
|
| Thu, 17 Apr 2014 17:32:04 +0200 |
Mads Kiilerich |
context: tell when .ancestor picks one of multiple common ancestors heads
|
file |
diff |
annotate
|
| Sun, 02 Mar 2014 18:25:19 +0100 |
Mads Kiilerich |
tests: add test case for criss cross merge
|
file |
diff |
annotate
|