tests/test-manifest-merging.t
author Jim Hague <jim.hague@acm.org>
Wed, 30 Mar 2011 09:49:45 +0100
changeset 13801 60256f7f30c1
parent 12253 e5aee120287b
child 16913 f2719b387380
permissions -rw-r--r--
bugzilla: add XMLRPC interface. Add support for access to Bugzilla via the XMLRPC interface. This requires a single username and password used to log in to Bugzilla, plus the URL of the Bugzilla installation. Commit messages are added to bugs as before, but security only permits them to be added as the username used to log in.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12253
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
     1
  $ hg init base
3325
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     2
12253
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
     3
  $ cd base
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
     4
  $ echo 'alpha' > alpha
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
     5
  $ hg ci -A -m 'add alpha'
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
     6
  adding alpha
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
     7
  $ cd ..
3325
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
     8
12253
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
     9
  $ hg clone base work
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    10
  updating to branch default
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    11
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3325
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    12
12253
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    13
  $ cd work
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    14
  $ echo 'beta' > beta
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    15
  $ hg ci -A -m 'add beta'
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    16
  adding beta
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    17
  $ cd ..
3325
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    18
12253
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    19
  $ cd base
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    20
  $ echo 'gamma' > gamma
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    21
  $ hg ci -A -m 'add gamma'
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    22
  adding gamma
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    23
  $ cd ..
3325
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    24
12253
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    25
  $ cd work
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    26
  $ hg pull -q
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    27
  $ hg merge
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    28
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    29
  (branch merge, don't forget to commit)
3325
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    30
12253
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    31
Update --clean to revision 1 to simulate a failed merge:
3325
50a18815e3f0 Revert changeset c67920d78248.
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff changeset
    32
12253
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    33
  $ rm alpha beta gamma
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    34
  $ hg update --clean 1
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    35
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
e5aee120287b tests: unify test-manifest*
Adrian Buehlmann <adrian@cadifra.com>
parents: 3988
diff changeset
    36