| Mon, 24 Nov 2014 16:16:34 -0800 |
Martin von Zweigbergk |
merge: separate out "both created" cases
|
| Mon, 24 Nov 2014 16:11:22 -0800 |
Martin von Zweigbergk |
merge: indent to prepare for next patch
|
| Mon, 24 Nov 2014 09:50:27 -0800 |
Martin von Zweigbergk |
merge: remove obsolete check for untracked files in 'dm' action
|
| Sun, 23 Nov 2014 23:10:34 -0800 |
Martin von Zweigbergk |
merge: remove dead assignment in applyupdates()
|
| Fri, 21 Nov 2014 13:06:04 -0800 |
Martin von Zweigbergk |
merge: move calculateupdates() before applyupdated()
|
| Mon, 24 Nov 2014 11:28:46 -0800 |
Martin von Zweigbergk |
merge: remove unused variables from _checkcollision()
|
| Thu, 20 Nov 2014 16:39:32 -0800 |
Martin von Zweigbergk |
merge: consistently use single quotes for non-user-facing strings
|
| Wed, 19 Nov 2014 08:50:08 -0800 |
Martin von Zweigbergk |
merge: remove confusing comment about --force
|
| Tue, 18 Nov 2014 16:14:32 -0800 |
Martin von Zweigbergk |
update: remove unnecessary check for unknown files with --check
|
| Fri, 14 Nov 2014 09:33:28 -0800 |
Martin von Zweigbergk |
manifestmerge: use already existing fl2 synonym for m2.flags(f)
|
| Thu, 13 Nov 2014 23:12:15 -0800 |
Martin von Zweigbergk |
merge: drop underscore prefix from _checkunknown()
|
| Tue, 14 Oct 2014 23:18:07 -0700 |
Martin von Zweigbergk |
manifest: transpose pair of pairs from diff()
|
| Tue, 14 Oct 2014 22:48:44 -0700 |
Martin von Zweigbergk |
manifest: for diff(), only iterate over files, not flags
|
| Tue, 14 Oct 2014 17:09:16 -0700 |
Martin von Zweigbergk |
manifest: repurpose flagsdiff() into (node-and-flag)diff()
|
| Mon, 13 Oct 2014 17:12:12 -0500 |
Matt Mackall |
merge: add merge.graft helper
|
| Wed, 08 Oct 2014 14:16:53 -0700 |
Martin von Zweigbergk |
merge: make error message consistent with other commands
|
| Tue, 07 Oct 2014 00:41:58 -0700 |
Pierre-Yves David |
merge.update: use `first` instead of direct indexing
|
| Wed, 01 Oct 2014 03:42:00 +0200 |
Mads Kiilerich |
merge: mute the status message when bid merge kicks in
|
| Wed, 01 Oct 2014 03:41:11 +0200 |
Mads Kiilerich |
merge: use bid merge by default (BC)
|
| Fri, 05 Sep 2014 11:36:20 -0700 |
Durham Goode |
dirstate: wrap setparent calls with begin/endparentchange (issue4353)
|
| Fri, 15 Aug 2014 11:48:05 -0500 |
Matt Mackall |
merge with stable
|
| Fri, 15 Aug 2014 16:20:47 +0200 |
Mads Kiilerich |
cleanup: avoid local vars shadowing imports
|
| Fri, 15 Aug 2014 02:39:01 +0200 |
Mads Kiilerich |
merge: show the scary multiple ancestor hint for merges only, not for updates
stable
|
| Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: fix stupid indentation left over from previous refactorings
|
| Fri, 28 Feb 2014 02:25:58 +0100 |
Mads Kiilerich |
merge: use separate lists for each action type
|
| Thu, 08 May 2014 16:54:23 -0700 |
Durham Goode |
merge: add labels parameter from merge.update to filemerge
|
| Fri, 09 May 2014 12:01:56 +0200 |
Mads Kiilerich |
merge: separate worker functions for batch remove and batch get
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
| Thu, 15 May 2014 02:14:59 +0200 |
Mads Kiilerich |
merge: move constant assignments a bit and use them more
|
| Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: change priority / ordering of merge actions
|
