Hi,
> 1) Try an rebase ("cws rebase -m"), this failed or was interrupted for
> one reason or another
> 2) Do an "svn revert -R ." to get rid of all the already merged stuff.
> 3) Do "cws rebase -m" again, worked this time.
> 4) Do a "cws rebase -C"
> suddenly you realize that many new files were
Hi Max,
Maximilian Odendahl wrote:
> Hi,
>
>> SVN 1.5.4 is OK.
>
> so any idea why new files were not added during rebase?
>
> -Max
>
I think we finally found out why the new files were not added during
rebase, many thanks to Mathias Bauer who pointed this out to me.
The one way to cause thi
Hi Max,
Maximilian Odendahl wrote:
> Hi,
>
>> SVN 1.5.4 is OK.
>
> so any idea why new files were not added during rebase?
Sorry, no. Without a log it's hard to guess what went wrong there.
Heiner
>
> -Max
>
> -
> To unsubs
Hi,
SVN 1.5.4 is OK.
so any idea why new files were not added during rebase?
-Max
-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.org
For additional commands, e-mail: dev-h...@openoffice.org
Hi Max
Maximilian Odendahl wrote:
> Hi,
>
>
>> looks like svn 1.6.x doesn't play nice with cws.pl, got a bug or two for
>> this lately. Now I'm wondering myself if it's required to make cws.pl
>> cope with all the 1.6 stuff, or is it good enough to check for 1.5.[56]
>> - which are known to work
> Probably easiest (= quickest) way to fix is to checkout/upate your
> tree to a state prior to the resync-attempt (can use date as
> revision), create a patch against the master it was based on at that
> time and then use that patch on the new master.
Thanks, will do...
-max
-
Hi,
looks like svn 1.6.x doesn't play nice with cws.pl, got a bug or two for
this lately. Now I'm wondering myself if it's required to make cws.pl
cope with all the 1.6 stuff, or is it good enough to check for 1.5.[56]
- which are known to work -
As I wrote earlier, I'm using 1.5.4, is this k
Hi Maximilian, *,
On Sun, Jul 12, 2009 at 8:28 PM, Maximilian
Odendahl wrote:
> [...]
> I can see them inside my rebase directory, but svn status gives a
> question mark. Shouldn't they all be added automatically to my cws
> during rebase? How can I fix this?
Probably easiest (= quickest) way to
Hi,
looks like svn 1.6.x doesn't play nice with cws.pl, got a bug or two for
this lately. Now I'm wondering myself if it's required to make cws.pl
cope with all the 1.6 stuff, or is it good enough to check for 1.5.[56]
- which are known to work - in cws.pl knowing that we'll get rid of this
tool b
Hi,
I wanted to rebase my cws notes9 to m52, but it failed miserably.
- EIS database was updated with a rebase to m47 instead of m52, can
someone fix that please?
- it seems that I'm missing all new files added somewhere along the
line, e.g. all the patches for redland, new containers and new f
Hi,
I wanted to rebase my cws notes9 to m52, but it failed miserably.
- EIS database was updated with a rebase to m47 instead of m52, can
someone fix that please?
- it seems that I'm missing all new files added somewhere along the
line, e.g. all the patches for redland, new containers and ne
Per Eriksson schrieb:
Per Eriksson skrev:
If you upgrade to 1.5.4 does it solve the problem?
well, rebase is already done, so it won't help for this time.
Any smart and easy way to find out all the added files and add them manuell?
-Max
--
Per Eriksson skrev:
If you upgrade to 1.5.4 does it solve the problem?
Meant 1.5.6 of course.
Per
-
To unsubscribe, e-mail: dev-unsubscr...@openoffice.org
For additional commands, e-mail: dev-h...@openoffice.org
Hello Maximilian and Caolán,
Maximilian Odendahl skrev:
Hi,
I wanted to rebase my cws notes9 to m52, but it failed miserably.
What version of svn are you using, I ran into endless misery with
rebasing until I gave up on any recent svn version and rolled back to
the last 1.5.X release of 1.5.
Hi,
I wanted to rebase my cws notes9 to m52, but it failed miserably.
What version of svn are you using, I ran into endless misery with
rebasing until I gave up on any recent svn version and rolled back to
the last 1.5.X release of 1.5.6
I'm using 1.5.4, which should be fine according to
ht
On Sun, 2009-07-12 at 11:28 -0700, Maximilian Odendahl wrote:
> Hi,
>
> I wanted to rebase my cws notes9 to m52, but it failed miserably.
What version of svn are you using, I ran into endless misery with
rebasing until I gave up on any recent svn version and rolled back to
the last 1.5.X release
Hi,
I wanted to rebase my cws notes9 to m52, but it failed miserably.
- EIS database was updated with a rebase to m47 instead of m52, can
someone fix that please?
- it seems that I'm missing all new files added somewhere along the
line, e.g. all the patches for redland, new containers and new f
17 matches
Mail list logo
