[Debian-l10n-devel] Merge upstream to trunk for Virtaal

Christian PERRIER bubulle at debian.org
Tue May 31 18:01:03 UTC 2011

Quoting Omar Campagne (ocampagne at gmail.com):

> cd trunk
> svn merge urltrunk urlupstream .
> This one is fine but deletes debian/ (which is recoverable anyway).
> How do you prefer this stuff do be done? Do you
> just use "svn copy" instead of merge?

Neither of those..:-)

The Right Way is to do:

cd trunk
svn merge url_formerupstream url_upstream

svn merge \
 svn+ssh://svn.debian.org/svn/debian-l10n/virtaal/branches/upstream/0.6.1 \

Or, in a more geeky way:

svn merge \

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/debian-l10n-devel/attachments/20110531/a0c1e527/attachment.pgp>

More information about the Debian-l10n-devel mailing list