← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mercurial/lucid

« back to all changes in this revision

Viewing changes to tests/test-merge-default.out

  • Committer: Bazaar Package Importer
  • Author(s): Vernon Tang
  • Date: 2009-01-18 10:39:58 UTC
  • mfrom: (8.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090118103958-4ep2fqb5nl2pyc7y
Tags: 1.1.2-2
http://bugs.debian.org/512155
* debian/mercurial.postinst: symlink /usr/share/doc/mercurial if dpkg didn't
  do it when upgrading (closes: #512155)
* debian/control: mercurial-common replaces all earlier versions of
  mercurial

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-merge-default.out
5
5
created new head
6
6
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7
7
% should fail because not at a head
8
 
abort: repo has 3 heads - please merge with an explicit rev
 
8
abort: branch 'default' has 3 heads - please merge with an explicit rev
9
9
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
10
10
% should fail because > 2 heads
11
 
abort: repo has 3 heads - please merge with an explicit rev
 
11
abort: branch 'default' has 3 heads - please merge with an explicit rev
12
12
% should succeed
13
13
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
14
14
(branch merge, don't forget to commit)