[PATCH 5 of 5] manifestv2: add support for writing new manifest format

Matt Mackall mpm at selenic.com
Wed Apr 1 17:54:38 CDT 2015


On Wed, 2015-04-01 at 10:34 -0700, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1427835693 25200
> #      Tue Mar 31 14:01:33 2015 -0700
> # Node ID 2fbe921fa4f43a3897d4c74ce74cafd73f0deddb
> # Parent  aca6ee57dddf4b39732833a2bb603dcd19148754
> manifestv2: add support for writing new manifest format

These are queued for default, thanks. Dropped this bit since it seems to
be debugging for the current OS X test failure:

> 74 57361477c778 000000000000
> diff -r aca6ee57dddf -r 2fbe921fa4f4 tests/test-subrepo-git.t
> --- a/tests/test-subrepo-git.t	Fri Mar 27 22:26:41 2015 -0700
> +++ b/tests/test-subrepo-git.t	Tue Mar 31 14:01:33 2015 -0700
> @@ -978,6 +978,7 @@
>    adding s/c.c (glob)
>    adding s/cpp.cpp (glob)
>    adding s/foobar.orig (glob)
> +  $ ls -l s/.hg
>    $ hg st --subrepos s
>    A s/.gitignore
>    A s/snake.python
> @@ -987,9 +988,11 @@
>    ? s/foobar.orig
>  
>  error given when adding an already tracked file
> +  $ ls -l s/.hg
>    $ hg add s/.gitignore
>    s/.gitignore already tracked!
>    [1]
> +  $ ls -l s/.hg
>    $ hg add s/g
>    s/g already tracked!
>    [1]
> @@ -997,9 +1000,11 @@
>  removed files can be re-added
>  removing files using 'rm' or 'git rm' has the same effect,
>  since we ignore the staging area
> +  $ ls -l s/.hg
>    $ hg ci --subrepos -m 'snake'
>    committing subrepository s
>    $ cd s
> +  $ ls -l .hg
>    $ rm snake.python
>  (remove leftover .hg so Mercurial doesn't look for a root here)
>    $ rm -r .hg
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list