tests/test-merge4.t
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Thu, 16 Jun 2011 01:57:53 +0200
changeset 14643 7e295dd10d40
parent 12156 4c94b6d0fb1c
child 16536 63c817ea4a70
permissions -rw-r--r--
hidden: Add a hiddenrevs attributes to changelog. This attributes hold the set of all revisions that should be ommited by command and tools displaying changesets. This set is given as a hit. Command and tools are responsible to check it in order to filter they outpur. Code adding revisions to the set are responsible to the consistency of it's data.

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg update 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo This is file c1 > c
  $ hg add c
  $ hg commit -m "commit #2"
  created new head
  $ hg merge 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ rm b
  $ echo This is file c22 > c
  $ hg commit -m "commit #3"