Mercurial > hg

annotate tests/test-issue1877.t @ 14508:07722bb8a08c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added signature for changeset 733af5d9f6b2
author Matt Mackall <mpm@selenic.com>
date Wed, 01 Jun 2011 16:32:48 -0500
parents 4d958d1bb072
children f2719b387380
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14498
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
1 http://mercurial.selenic.com/bts/issue1877
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
2
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
3 $ hg init a
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
4 $ cd a
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
5 $ echo a > a
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
6 $ hg add a
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
7 $ hg ci -m 'a'
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
8 $ echo b > a
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
9 $ hg ci -m'b'
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
10 $ hg up 0
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
12 $ hg book main
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
13 $ hg book
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
14 * main 0:cb9a9f314b8b
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
15 $ echo c > c
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
16 $ hg add c
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
17 $ hg ci -m'c'
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
18 created new head
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
19 $ hg book
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
20 * main 2:d36c0562f908
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
21 $ hg heads
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
22 changeset: 2:d36c0562f908
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
23 bookmark: main
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
24 tag: tip
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
25 parent: 0:cb9a9f314b8b
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
26 user: test
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
27 date: Thu Jan 01 00:00:00 1970 +0000
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
28 summary: c
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
29
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
30 changeset: 1:1e6c11564562
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
31 user: test
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
32 date: Thu Jan 01 00:00:00 1970 +0000
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
33 summary: b
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
34
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
35 $ hg up 1e6c11564562
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
36 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
37 $ hg merge main
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
39 (branch merge, don't forget to commit)
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
40 $ hg book
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
41 main 2:d36c0562f908
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
42 $ hg ci -m'merge'
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
43 $ hg book
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
44 main 2:d36c0562f908
4d958d1bb072 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
45