[PATCH 1 of 2 V9] update: fix bare update to work on new branch (BC)

Yuya Nishihara yuya at tcha.org
Thu Apr 14 11:39:23 EDT 2016


On Fri, 15 Apr 2016 00:03:25 +0900, Yuya Nishihara wrote:
> On Wed, 13 Apr 2016 13:29:56 +0200, liscju wrote:
> > # HG changeset patch
> > # User liscju <piotr.listkiewicz at gmail.com>
> > # Date 1459832013 -7200
> > #      Tue Apr 05 06:53:33 2016 +0200
> > # Node ID f5f2ade3ad9fa5ce6f4c908273c74d1228b03e0c
> > # Parent  02be5fc18c0c70c087a9d1ab5ffe5afce926f227
> > update: fix bare update to work on new branch (BC)  
> 
> Queued this, thanks for reviewing and updating the patches.

Oops, I got a couple of test failures.

> --- /home/yuya/work/hghacks/mercurial-review/tests/test-update-branches.t
> +++ /home/yuya/work/hghacks/mercurial-review/tests/test-update-branches.t.err
> @@ -269,8 +269,7 @@
>  - update to the tipmost branch head
> 
>    $ norevtest "non-closed 1 should be chosen" clean null
> -  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  parent=1
> +  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> 
>  if all branch heads are closed
>  - update to "tip"
> @@ -281,10 +280,7 @@
>    $ hg commit --close-branch -m "#4"
> 
>    $ norevtest "all branches are closed" clean null
> -  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  no open descendant heads on branch "foobar", updating to a closed head
> -  (committing will reopen branch "foobar")
> -  parent=4
> +  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> 
>    $ cd ../b1
> 
> 
> ERROR: test-update-branches.t output changed
> !...........................................................s................
> --- /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr.t
> +++ /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr.t.err
> @@ -206,9 +206,10 @@
> 
>    $ cd source-hg
>    $ hg up
> -  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

This bit is interesting.

We are at "null" revision which belongs to pseudo "default" branch, and we
have no "default" branch in changelog. That means we can no longer leave the
"null" revision by "hg up".

Perhaps we shouldn't remove the workaround for "no default branch!".

>    $ hg cat syma; echo
> -  a
> +  syma: no such file in rev 000000000000
> +
>    $ cd ../..
> 
>  #endif
> 
> ERROR: test-convert-bzr.t output changed
> 
> --- /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-114.t
> +++ /home/yuya/work/hghacks/mercurial-review/tests/test-convert-bzr-114.t.err
> @@ -35,5 +35,5 @@
>    644   d/a
>    $ cd source-hg
>    $ hg update
> -  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ cd ../..
> 
> ERROR: test-convert-bzr-114.t output changed
> Skipped test-convert-p4-filetypes.t: missing feature: Perforce server and client
> Skipped test-convert-mtn.t: missing feature: monotone client (>= 1.0)
> Skipped test-casecollision-merge.t: missing feature: case insensitive file system
> Skipped test-convert-baz.t: missing feature: GNU Arch baz client
> Skipped test-casefolding.t: missing feature: case insensitive file system
> Skipped test-convert-p4.t: missing feature: Perforce server and client
> Skipped test-convert-tla.t: missing feature: GNU Arch tla client
> Skipped test-convert-darcs.t: missing feature: darcs client
> Skipped test-verify-repo-operations.py: missing feature: allow slow tests
> Skipped test-no-symlinks.t: system supports symbolic links
> Skipped test-docker-packaging.t: missing feature: docker support
> Skipped test-debian-packages.t: missing feature: debian packaging tools
> Failed test-update-branches.t: output changed
> Failed test-convert-bzr.t: output changed
> Failed test-convert-bzr-114.t: output changed
> # Ran 504 tests, 12 skipped, 0 warned, 3 failed.


More information about the Mercurial-devel mailing list