tests/test-import-bypass.t
changeset 34661 eb586ed5d8ce
parent 29900 50f2966f86ca
child 36027 d667302b6ee1
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
   264   $ hg clone -r1 repo-options repo-multi1
   264   $ hg clone -r1 repo-options repo-multi1
   265   adding changesets
   265   adding changesets
   266   adding manifests
   266   adding manifests
   267   adding file changes
   267   adding file changes
   268   added 2 changesets with 2 changes to 1 files
   268   added 2 changesets with 2 changes to 1 files
       
   269   new changesets 07f494440405:4e322f7ce8e3
   269   updating to branch foo
   270   updating to branch foo
   270   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   271   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   271   $ cd repo-multi1
   272   $ cd repo-multi1
   272   $ hg up 0
   273   $ hg up 0
   273   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   274   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   290   $ hg clone -r1 repo-options repo-multi2
   291   $ hg clone -r1 repo-options repo-multi2
   291   adding changesets
   292   adding changesets
   292   adding manifests
   293   adding manifests
   293   adding file changes
   294   adding file changes
   294   added 2 changesets with 2 changes to 1 files
   295   added 2 changesets with 2 changes to 1 files
       
   296   new changesets 07f494440405:4e322f7ce8e3
   295   updating to branch foo
   297   updating to branch foo
   296   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   298   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   297   $ cd repo-multi2
   299   $ cd repo-multi2
   298   $ hg import --bypass --exact ../patch1.diff ../patch2.diff
   300   $ hg import --bypass --exact ../patch1.diff ../patch2.diff
   299   applying ../patch1.diff
   301   applying ../patch1.diff