view tests/test-merge4.t @ 19485:02c71f96eb6c stable

hgweb: always start graph with the revision in url It is the same fix for graph command, as was recently for log. This makes the specified revision be always on top of the graph view. Before the patch, for example with repo having revisions 0, 1, 2, 3 and revision in url being '2', all revisions were shown and the specified one wasn't the first.
author Alexander Plavin <me@aplavin.ru>
date Thu, 25 Jul 2013 02:48:21 +0400
parents 63c817ea4a70
children 8561ad49915d
line wrap: on
line source

  $ 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

Test hg behaves when committing with a missing file added by a merge

  $ hg commit -m "commit #3"
  abort: cannot commit merge with missing files
  [255]