view tests/test-rename-dir-merge @ 9079:70c707310d7a

Makefile: wrap hg.pot strings at 82 chars By default, xgettext will wrap strings at 79 characters. This width includes the two double-quotes and the '\n' added. Our strings are now wrapped at 78 characters and a line can therefore be up to 82 characters wide in the .po file. Setting the width to 82 characters ensures that xgettext does no silly wrapping on our already-wrapped strings while still wrapping long one-liners at 82 characters.
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Jul 2009 23:54:42 +0200
parents 6c82beaaa11a
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init

mkdir a
echo foo > a/a
echo bar > a/b
hg ci -Am "0"

hg co -C 0
hg mv a b
hg ci -m "1 mv a/ b/"

hg co -C 0
echo baz > a/c
echo quux > a/d
hg add a/c
hg ci -m "2 add a/c"

hg merge --debug 1
echo a/* b/*
hg st -C
hg ci -m "3 merge 2+1"
hg debugrename b/c

hg co -C 1
hg merge --debug 2
echo a/* b/*
hg st -C
hg ci -m "4 merge 1+2"
hg debugrename b/c