tests/test-origbackup-conflict.t
changeset 34570 dbb2027f4974
parent 34543 6fad8059a970
child 34691 857fc3313f7b
equal deleted inserted replaced
34569:e304fd82c718 34570:dbb2027f4974
    78   $ ln -s ../../../sym-link-target b
    78   $ ln -s ../../../sym-link-target b
    79   $ hg up b1
    79   $ hg up b1
    80   b: replacing untracked file
    80   b: replacing untracked file
    81   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    81   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    82   (activating bookmark b1)
    82   (activating bookmark b1)
    83   $ readlink .hg/origbackups/b
    83   $ readlink.py .hg/origbackups/b
    84   ../../../sym-link-target
    84   .hg/origbackups/b -> ../../../sym-link-target
    85 
    85 
    86 Perform an update that causes b/c to be backed up again - it should not go into the target dir
    86 Perform an update that causes b/c to be backed up again - it should not go into the target dir
    87 
    87 
    88   $ hg up -q 0
    88   $ hg up -q 0
    89   $ mkdir b
    89   $ mkdir b