Mercurial > hg
view tests/test-default-push @ 6297:fed1a9c22076
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | 6dbb8ae0a0b3 |
children |
line wrap: on
line source
#!/bin/sh hg init a echo a > a/a hg --cwd a ci -Ama hg clone a c hg clone a b echo b >> b/a hg --cwd b ci -mb echo % push should push to default when default-push not set hg --cwd b push | sed 's/pushing to.*/pushing/' echo % push should push to default-push when set echo 'default-push = ../c' >> b/.hg/hgrc hg --cwd b push | sed 's/pushing to.*/pushing/'