Mercurial > hg
annotate tests/test-issue1502.t @ 29120:a39341452647
tests: test-check-py3-compat.t output updated
The test output was not updated as the lower section of the test updates
with python3.5, so it might be the case that people have updated the modules
but the test was left as it was. So this patch updates the test output.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Fri, 06 May 2016 21:41:25 +0530 |
parents | 9e0535da20a5 |
children | eb586ed5d8ce |
rev | line source |
---|---|
26420
2fc86d92c4a9
urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents:
19798
diff
changeset
|
1 https://bz.mercurial-scm.org/1502 |
13478
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
2 |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
3 Initialize repository |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
4 |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
5 $ hg init foo |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
6 $ touch foo/a && hg -R foo commit -A -m "added a" |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
7 adding a |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
8 |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
9 $ hg clone foo foo1 |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
10 updating to branch default |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
12 |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
13 $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1" |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
14 $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo" |
28064
9e0535da20a5
test: drop useless --update flag in issue1502 tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26968
diff
changeset
|
15 $ hg -R foo1 pull |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14485
diff
changeset
|
16 pulling from $TESTTMP/foo (glob) |
13478
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
17 searching for changes |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
18 adding changesets |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
19 adding manifests |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
20 adding file changes |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
21 added 1 changesets with 1 changes to 1 files (+1 heads) |
28064
9e0535da20a5
test: drop useless --update flag in issue1502 tests
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26968
diff
changeset
|
22 (run 'hg heads' to see heads, 'hg merge' to merge) |
13478
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
23 |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
24 $ hg -R foo1 book branchy |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
25 $ hg -R foo1 book |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
26 * branchy 1:e3e522925eff |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
27 |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
28 Pull. Bookmark should not jump to new head. |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
29 |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
30 $ echo "there" >> foo/a && hg -R foo commit -m "edited a again" |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
31 $ hg -R foo1 pull |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14485
diff
changeset
|
32 pulling from $TESTTMP/foo (glob) |
13478
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
33 searching for changes |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
34 adding changesets |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
35 adding manifests |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
36 adding file changes |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
37 added 1 changesets with 1 changes to 1 files |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
38 (run 'hg update' to get a working copy) |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
39 |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
40 $ hg -R foo1 book |
c631ac076375
bookmarks: restrict moving a bookmark to its descendants (issue1502)
David Soria Parra <dsp@php.net>
parents:
diff
changeset
|
41 * branchy 1:e3e522925eff |