tests/test-issue1877.t
author Durham Goode <durham@fb.com>
Tue, 26 Nov 2013 16:23:05 -0800
branchstable
changeset 20149 578b888c820e
parent 16913 f2719b387380
child 21404 ca275f7ec576
permissions -rw-r--r--
unshelve: don't commit unknown files during unshelve (issue4113) Previously, unshelve would temporarily commit unknown files (via addremove) in an attempt to allow unshelving into unknown files. This produced unexpected results, like the file time stamp changing and a .i file being created. This change makes it no longer use addremove. It ignores unknown files completely. If an unshelve would overwrite an unknown file, the unknown file is moved to *.orig The shelve continue/abort format is changed, but it just removes stuff from the end of the file, so it can still read the old format.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13806
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
     1
http://mercurial.selenic.com/bts/issue1877
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
     2
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
     3
  $ hg init a
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
     4
  $ cd a
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
     5
  $ echo a > a
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
     6
  $ hg add a
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
     7
  $ hg ci -m 'a'
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
     8
  $ echo b > a
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
     9
  $ hg ci -m'b'
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    10
  $ hg up 0
8ba08a16e4e0 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
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    12
  $ hg book main
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    13
  $ hg book
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    14
   * main                      0:cb9a9f314b8b
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    15
  $ echo c > c
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    16
  $ hg add c
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    17
  $ hg ci -m'c'
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    18
  created new head
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    19
  $ hg book
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    20
   * main                      2:d36c0562f908
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    21
  $ hg heads
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    22
  changeset:   2:d36c0562f908
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    23
  bookmark:    main
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    24
  tag:         tip
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    25
  parent:      0:cb9a9f314b8b
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    26
  user:        test
8ba08a16e4e0 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
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    28
  summary:     c
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    29
  
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    30
  changeset:   1:1e6c11564562
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    31
  user:        test
8ba08a16e4e0 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
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    33
  summary:     b
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    34
  
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    35
  $ hg up 1e6c11564562
8ba08a16e4e0 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
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    37
  $ hg merge main
8ba08a16e4e0 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
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    39
  (branch merge, don't forget to commit)
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    40
  $ hg book
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    41
     main                      2:d36c0562f908
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    42
  $ hg ci -m'merge'
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    43
  $ hg book
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    44
     main                      2:d36c0562f908
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset
    45
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 13806
diff changeset
    46
  $ cd ..