Sun, 13 Apr 2014 18:45:43 +0200 |
Mads Kiilerich |
largefiles: copy override, install matchfn outside the try/except restoring it
|
Sun, 13 Apr 2014 18:45:43 +0200 |
Mads Kiilerich |
largefiles: clarify installmatchfn documentation
|
Sat, 27 Apr 2013 23:19:52 +0200 |
Mads Kiilerich |
largefiles: use more reasonable locking for update
|
Sat, 27 Apr 2013 23:19:52 +0200 |
Mads Kiilerich |
largefiles: full debugdirstate functionality for largefiles
|
Sat, 27 Apr 2013 23:19:52 +0200 |
Mads Kiilerich |
largefiles: make cat on standins do something
|
Sun, 13 Apr 2014 18:45:43 +0200 |
Mads Kiilerich |
largefiles: remove confusing handling of .bad return value - it is void
|
Sun, 06 Apr 2014 13:39:51 +0200 |
Mads Kiilerich |
merge: pass merge ancestor to calculateupdates as a list
|
Sun, 06 Apr 2014 13:39:51 +0200 |
Mads Kiilerich |
merge: move ancestor selection tweaking from manifestmerge to update function
|
Wed, 16 Apr 2014 00:37:24 +0900 |
FUJIWARA Katsunori |
largefiles: remove no more referred "getoutgoinglfiles()"
|
Wed, 16 Apr 2014 00:37:24 +0900 |
FUJIWARA Katsunori |
largefiles: use "outgoinghooks" to avoid redundant outgoing check
|
Wed, 16 Apr 2014 00:37:24 +0900 |
FUJIWARA Katsunori |
largefiles: use "summaryremotehooks" to avoid redundant outgoing check
|
Wed, 16 Apr 2014 00:37:24 +0900 |
FUJIWARA Katsunori |
largefiles: centralize the logic to get outgoing largefiles
|
Mon, 07 Apr 2014 23:10:20 +0200 |
Mads Kiilerich |
largefiles: don't prompt when one side of merge was changed but didn't change
|
Sun, 02 Mar 2014 18:30:41 +0100 |
Mads Kiilerich |
largefiles: override calculateupdates instead of manifestmerge
|
Tue, 11 Feb 2014 09:00:38 -0800 |
Lucas Moscovicz |
hgext: updated extensions to return a baseset when adding symbols
|
Sat, 16 Nov 2013 15:54:41 -0500 |
Mads Kiilerich |
largefiles: stylistic cleanup of filemerge
|
Sat, 16 Nov 2013 15:46:29 -0500 |
Mads Kiilerich |
largefiles: show hashes before prompting for conflict resolution
|
Sat, 16 Nov 2013 15:46:29 -0500 |
Mads Kiilerich |
largefiles: don't try to explain rename history before prompt for conflicts
|
Sat, 16 Nov 2013 15:46:29 -0500 |
Mads Kiilerich |
largefiles: drop redundant special handling of merges of renames
|
Sun, 01 Dec 2013 14:10:53 -0600 |
Matt Mackall |
merge with stable
|
Tue, 26 Nov 2013 15:38:33 +0100 |
Mads Kiilerich |
largefiles: don't crash on 'local renamed directory' actions
stable
|
Wed, 06 Nov 2013 18:19:04 -0500 |
Augie Fackler |
pathutil: tease out a new library to break an import cycle from canonpath use
|
Mon, 28 Oct 2013 22:34:07 +0100 |
Mads Kiilerich |
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
stable
|
Fri, 25 Oct 2013 02:33:59 +0800 |
Mads Kiilerich |
largefiles: don't prompt for normal/largefile changes when doing plain updates
stable
|
Fri, 25 Oct 2013 02:25:10 +0800 |
Mads Kiilerich |
largefiles: remove extra check for file to get - it _is_ by definition in p2
stable
|
Fri, 25 Oct 2013 01:24:10 +0800 |
Mads Kiilerich |
largefiles: don't process merge actions at all when overwriting
stable
|
Mon, 23 Sep 2013 21:41:01 -0700 |
Siddharth Agarwal |
largefiles: standardize error message for dirty working dir
|
Fri, 20 Sep 2013 15:26:30 -0700 |
Siddharth Agarwal |
largefiles: remove bailifchanged check from overridepull (BC)
|
Wed, 24 Jul 2013 13:20:44 +0800 |
Wei, Elson |
largefiles: overridematch() should replace the file path instead of extending (issue3934)
stable
|
Wed, 22 May 2013 17:31:43 -0500 |
Matt Mackall |
ui: merge prompt text components into a singe string
|