208 .hgsubstate: versions differ -> m |
208 .hgsubstate: versions differ -> m |
209 updating: .hgsubstate 1/1 files (100.00%) |
209 updating: .hgsubstate 1/1 files (100.00%) |
210 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
210 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
211 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
211 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
212 getting subrepo t |
212 getting subrepo t |
|
213 searching for copies back to rev 1 |
213 resolving manifests |
214 resolving manifests |
214 overwrite: True, partial: False |
215 overwrite: False, partial: False |
215 ancestor: 60ca1237c194+, local: 60ca1237c194+, remote: 6747d179aa9a |
216 ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a |
216 t: remote is newer -> g |
217 t: remote is newer -> g |
217 updating: t 1/1 files (100.00%) |
218 updating: t 1/1 files (100.00%) |
218 getting t |
219 getting t |
219 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
220 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
220 (branch merge, don't forget to commit) |
221 (branch merge, don't forget to commit) |
578 $ echo 1 > repo2/s/a |
579 $ echo 1 > repo2/s/a |
579 $ hg -R repo2/s ci -m2 |
580 $ hg -R repo2/s ci -m2 |
580 $ hg -q -R repo2/s push |
581 $ hg -q -R repo2/s push |
581 $ hg -R repo2/s up -C 0 |
582 $ hg -R repo2/s up -C 0 |
582 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
583 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
583 $ echo 2 > repo2/s/a |
584 $ echo 2 > repo2/s/b |
584 $ hg -R repo2/s ci -m3 |
585 $ hg -R repo2/s ci -m3 -A |
|
586 adding b |
585 created new head |
587 created new head |
586 $ hg -R repo2 ci -m3 |
588 $ hg -R repo2 ci -m3 |
587 $ hg -q -R repo2 push |
589 $ hg -q -R repo2 push |
588 abort: push creates new remote head 9d66565e64e1! |
590 abort: push creates new remote head cc505f09a8b2! |
589 (did you forget to merge? use push -f to force) |
591 (did you forget to merge? use push -f to force) |
590 [255] |
592 [255] |
591 $ hg -R repo update |
593 $ hg -R repo update |
592 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
594 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
595 |
|
596 test if untracked file is not overwritten |
|
597 |
|
598 $ echo issue3276_ok > repo/s/b |
|
599 $ hg -R repo2 push -f -q |
|
600 $ hg -R repo update |
|
601 b: untracked file differs |
|
602 abort: untracked files in working directory differ from files in requested revision |
|
603 [255] |
|
604 |
|
605 $ cat repo/s/b |
|
606 issue3276_ok |
|
607 $ rm repo/s/b |
|
608 $ hg -R repo revert --all |
|
609 reverting repo/.hgsubstate |
|
610 reverting subrepo s |
|
611 $ hg -R repo update |
|
612 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
613 $ cat repo/s/b |
|
614 2 |
593 $ rm -rf repo2 repo |
615 $ rm -rf repo2 repo |
594 |
616 |
595 |
617 |
596 Issue1852 subrepos with relative paths always push/pull relative to default |
618 Issue1852 subrepos with relative paths always push/pull relative to default |
597 |
619 |