[Pkg-lyx-devel] svn-upgrade and branches

[Sven Hoexter]

Hi,
so now I've got a slight problem. I guess if I svn-upgrade the LyX 1.6beta3
over my created branch it will also update branches/upstream/current to
1.6beta3 which in turn I guess creates problem when importing a 1.5.6
release.

So at this point I'm now stuck. I think one easy way out for me would be
to simply set the mergeWithUpstream prop again in the 1.6 branch and on merge
time for 1.5-> 1.6 we'll run svn-upgrade on the trunk and then merge only
the debian directory from the branch.

Another way could be to simply roll out the new tarball over the branch but
I'm unsure how this could effect the merge afterwards.

Any ideas or experience to share?

Sven
-- 
If God passed a mic to me to speak
I'd say stay in bed, world
Sleep in peace
   [The Cardigans - 03:45: No sleep]