[PATCH 2 of 3] largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on

Matt Mackall mpm at selenic.com
Sat Oct 29 11:14:10 CDT 2011


On Fri, 2011-10-28 at 18:54 +0200, Na'Tosha Bard wrote:
> # HG changeset patch
> # User Na'Tosha Bard <natosha at unity3d.com>
> # Date 1319820504 -7200
> # Node ID 32ad9c5195d9543d0123c4e0d1b906a0c68c3edb
> # Parent  c16217607b25c58856f49bbd12479c76720e763e
> largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on

This fails check-code:

hgext/largefiles/overrides.py:822 (natosha at 15383):
 > 	result = orig(ui, repo, *revs, **opts)
 don't use tabs
hgext/largefiles/overrides.py:823 (natosha at 15383):
 > 	lfcommands.updatelfiles(repo.ui, repo)
 don't use tabs
hgext/largefiles/overrides.py:824 (natosha at 15383):
 > 	return result
 don't use tabs

And tests:

--- /home/mpm/hg/tests/test-largefiles.t 
+++ /home/mpm/hg/tests/test-largefiles.t.err 
@@ -746,24 +746,14 @@
 
   $ cd ..
   $ hg clone -r 8 d e 
-  adding changesets
-  adding manifests
-  adding file changes
-  added 9 changesets with 26 changes to 10 files
-  updating to branch default
-  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  getting changed largefiles
-  3 largefiles updated, 0 removed
+  abort: destination 'e' is not empty
+  [255]
   $ cd e
   $ hg transplant -s ../d 598410d3eb9a 
   searching for changes
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 2 changes to 2 files
-  getting changed largefiles
-  1 largefiles updated, 0 removed
+  skipping already applied revision 9:598410d3eb9a
+  getting changed largefiles
+  0 largefiles updated, 0 removed
   $ hg log
   changeset:   9:598410d3eb9a
   tag:         tip




-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list