comparison tests/test-rebase-conflicts.t @ 15742:65df60a3f96b

phases: prevent rebase to rebase immutable changeset.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 27 Dec 2011 00:11:22 +0100
parents 2371f4aea665
children e66084ef8449
comparison
equal deleted inserted replaced
15741:60344b83e442 15742:65df60a3f96b
1 $ cat >> $HGRCPATH <<EOF 1 $ cat >> $HGRCPATH <<EOF
2 > [extensions] 2 > [extensions]
3 > graphlog= 3 > graphlog=
4 > rebase= 4 > rebase=
5 >
6 > [phases]
7 > publish=False
5 > 8 >
6 > [alias] 9 > [alias]
7 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" 10 > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
8 > EOF 11 > EOF
9 12