Mercurial > hg

log tests/test-merge-criss-cross.t @ 51715:7601978f9e9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -50 -30 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()`
Wed, 10 Mar 2021 13:14:32 +0530 Pulkit Goyal commit: get info from mergestate whether a file was merged or not
Wed, 30 Sep 2020 18:07:21 +0530 Pulkit Goyal merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED
Wed, 30 Sep 2020 17:51:40 +0530 Pulkit Goyal tests: fix a typo in `desc()` revset in test-merge-criss-cross.t
Wed, 30 Sep 2020 15:46:54 +0530 Pulkit Goyal merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
Mon, 24 Aug 2020 15:35:34 +0530 Pulkit Goyal merge: store cases when a file is absent post merge in commitinfo
Mon, 14 Sep 2020 15:08:15 +0530 Pulkit Goyal tests: add some more debugmergestate calls in `test-merge-criss-cross.t`
Thu, 03 Sep 2020 13:58:14 +0530 Pulkit Goyal commit: force create a new filenode if it was set in mergestate by merge
Thu, 03 Sep 2020 13:44:06 +0530 Pulkit Goyal merge: store commitinfo if these is a dc or cd conflict
Mon, 14 Sep 2020 14:11:45 +0530 Pulkit Goyal tests: add some debugmergestate calls in `test-merge-criss-cross.t`
Thu, 03 Sep 2020 13:54:46 +0530 Pulkit Goyal tests: add few debugrevlogindex and a log call to see changes in next test
Mon, 14 Sep 2020 14:31:23 +0530 Pulkit Goyal configitems: add a new config option to control new filenode functionality
Wed, 09 Sep 2020 16:49:19 +0530 Pulkit Goyal mergestate: introduce a new ACTION_KEEP_NEW
Thu, 03 Sep 2020 13:25:29 +0530 Pulkit Goyal merge: move initial handling of mergeactions near to later one
Mon, 24 Aug 2020 17:22:28 +0530 Pulkit Goyal merge: add missing ACTION_KEEP when both remote and ancestor are not present
Mon, 24 Aug 2020 15:20:09 +0530 Pulkit Goyal merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally
Fri, 19 Jun 2020 13:27:46 +0200 Pierre-Yves David tests: add criss cross merging tests whose behavior need to be fixed
Wed, 26 Aug 2020 17:20:53 +0530 Pulkit Goyal merge: show list of bids for each file in bid-merge in ui.debug()
Wed, 26 Aug 2020 17:24:22 +0530 Pulkit Goyal merge: show number of ancestors in bid merge debug notes
Fri, 24 Jan 2020 10:39:55 -0800 Martin von Zweigbergk copies: print debug information about copies per side/branch
Wed, 22 Jan 2020 15:20:12 -0800 Martin von Zweigbergk copies: move early return in mergecopies() earlier
Thu, 11 Apr 2019 23:28:38 -0700 Martin von Zweigbergk copies: delete debug message about search limit
Fri, 12 Apr 2019 22:03:04 -0700 Martin von Zweigbergk copies: don't include copies that are not in source in directory move
Sat, 13 Apr 2019 23:18:56 -0700 Martin von Zweigbergk tests: split out separate test for issue5020
Tue, 26 Jun 2018 15:26:21 -0700 Sean Farley revset: add optimization for heads(commonancestors())
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
Sat, 01 Apr 2017 14:48:39 -0400 Matt Harbison tests: add globs for Windows
Tue, 31 Jan 2017 03:25:59 +0100 Mads Kiilerich merge: fix crash on criss cross merge with dir move and delete (issue5020) stable
less more | (0) -50 -30 tip