| Thu, 18 Dec 2014 09:22:09 -0800 |
Martin von Zweigbergk |
merge: move checking of unknown files out of manifestmerge()
|
| Sat, 13 Dec 2014 23:52:22 -0800 |
Martin von Zweigbergk |
merge: extract method for checking for conflicting untracked file
|
| Mon, 15 Dec 2014 16:45:19 -0800 |
Martin von Zweigbergk |
merge: create 'cm' action for 'get or merge' case
|
| Fri, 12 Dec 2014 23:18:36 -0800 |
Martin von Zweigbergk |
merge: don't overwrite untracked file at directory rename target
|
| Tue, 18 Nov 2014 20:29:25 -0800 |
Martin von Zweigbergk |
merge: remove constant tuple element from 'aborts'
|
| Wed, 19 Nov 2014 11:51:31 -0800 |
Martin von Zweigbergk |
merge: collect checking for unknown files at end of manifestmerge()
|
| Wed, 19 Nov 2014 11:48:30 -0800 |
Martin von Zweigbergk |
merge: introduce 'c' action like 'g', but with additional safety
|
| Wed, 19 Nov 2014 11:44:00 -0800 |
Martin von Zweigbergk |
merge: structure 'remote created' code to match table
|
| Thu, 11 Dec 2014 22:07:41 -0800 |
Martin von Zweigbergk |
merge: make calculateupdates() return file->action dict
|
| Thu, 11 Dec 2014 21:58:49 -0800 |
Martin von Zweigbergk |
merge: let _forgetremoved() work on the file->action dict
|
| Thu, 11 Dec 2014 21:06:16 -0800 |
Martin von Zweigbergk |
merge: let _resolvetrivial() work on the file->action dict
|
| Thu, 11 Dec 2014 20:56:53 -0800 |
Martin von Zweigbergk |
merge: let bid merge work on the file->action dict
|
| Mon, 08 Dec 2014 13:24:10 -0800 |
Martin von Zweigbergk |
merge: write manifestmerge() using dictionary with entry per file
|
| Fri, 14 Nov 2014 05:53:04 -0800 |
Martin von Zweigbergk |
merge: perform case-collision checking on final set of actions
|
| Thu, 11 Dec 2014 21:21:21 -0800 |
Martin von Zweigbergk |
merge: move cd/dc prompts after largefiles prompts
|
| Wed, 03 Dec 2014 13:50:28 -0800 |
Martin von Zweigbergk |
merge: extract _resolvetrivial() function
|
| Tue, 09 Dec 2014 16:49:55 -0800 |
Martin von Zweigbergk |
merge: don't treat 'diverge' and 'renamedelete' like actions
|
| Tue, 09 Dec 2014 14:18:31 -0800 |
Martin von Zweigbergk |
merge: move dr/rd warning messages out of applyupdates()
|
| 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
|
| Fri, 05 Dec 2014 12:10:56 -0600 |
Matt Mackall |
merge with stable
|
| Wed, 03 Dec 2014 11:02:52 -0800 |
Martin von Zweigbergk |
merge: don't overwrite conflicting file in locally renamed directory
|
| Wed, 03 Dec 2014 10:56:07 -0800 |
Martin von Zweigbergk |
merge: don't ignore conflicting file in remote renamed directory
|
| Sun, 23 Nov 2014 15:08:50 -0800 |
Martin von Zweigbergk |
merge: duplicate 'if f in copied' into each branch
|
| Sun, 23 Nov 2014 14:09:10 -0800 |
Martin von Zweigbergk |
merge: branch code into {n1 and n2, n1, n2} top-level cases
|
| Sun, 16 Nov 2014 23:41:44 -0800 |
Martin von Zweigbergk |
update: don't overwrite untracked ignored files on update
stable
|
| Wed, 26 Nov 2014 10:25:27 -0800 |
Martin von Zweigbergk |
merge: display modify/delete conflict prompts in sorted order
|
| Mon, 01 Dec 2014 19:34:11 -0600 |
Matt Mackall |
merge with stable
|
| Mon, 01 Dec 2014 02:30:21 +0100 |
Mads Kiilerich |
merge: before cd/dc prompt, check that changed side really changed
stable 3.2.2
|
| Wed, 26 Nov 2014 15:37:01 -0800 |
Pierre-Yves David |
manifest: document the extra letter in working copy manifest node
|
