Bernd Schmidt <[EMAIL PROTECTED]> wrote:
> One more question (I'm experimenting... excuse the stupid questions
> but I'd rather not accidentally mess up the branch). What I did now was,
> first,
>
>~/svnmerge.py merge -r 96659-96679
>
> just to get started, then
>
>~/svnmerge.py merge -
One more question (I'm experimenting... excuse the stupid questions but
I'd rather not accidentally mess up the branch). What I did now was, first,
~/svnmerge.py merge -r 96659-96679
just to get started, then
~/svnmerge.py merge -F -r 96681,,9
with the list of numbers cut&pasted fro
Bernd Schmidt <[EMAIL PROTECTED]> wrote:
>>> One additional question, suppose I don't want to merge a huge number of
>>> revisions in one go, and I do
>>> svnmerge.py merge -r a-small-list-of-revisions
>>> svn diff ;; to verify everything is OK
>>>
>>> Do I then have to commit the merge so far
Giovanni Bajo wrote:
Bernd Schmidt <[EMAIL PROTECTED]> wrote:
One additional question, suppose I don't want to merge a huge number of
revisions in one go, and I do
svnmerge.py merge -r a-small-list-of-revisions
svn diff ;; to verify everything is OK
Do I then have to commit the merge so f
Bernd Schmidt <[EMAIL PROTECTED]> wrote:
> One additional question, suppose I don't want to merge a huge number of
> revisions in one go, and I do
>svnmerge.py merge -r a-small-list-of-revisions
>svn diff ;; to verify everything is OK
>
> Do I then have to commit the merge so far before ru
Bernd Schmidt <[EMAIL PROTECTED]> wrote:
> One additional question, suppose I don't want to merge a huge number of
> revisions in one go, and I do
>svnmerge.py merge -r a-small-list-of-revisions
>svn diff ;; to verify everything is OK
>
> Do I then have to commit the merge so far before ru
Bernd Schmidt <[EMAIL PROTECTED]> wrote:
>> Anyway, I have fixed the bug in svnmerge and attached a new version for
you
>> in this mail.
>
> Thanks for the quick fix. This seems to be working now ("svnmerge.py
> avail" gives me a rather enormous list of revision numbers).
Yes. It'll take some ti
One additional question, suppose I don't want to merge a huge number of
revisions in one go, and I do
svnmerge.py merge -r a-small-list-of-revisions
svn diff ;; to verify everything is OK
Do I then have to commit the merge so far before running svnmerge.py
again, or can it get all the infor
This was the correct command to do, assuming that you *never* merged your
branch since its original creation. I inspected the history of the branch
(through 'svn log') and it seems this assumption is correct.
Yes.
Anyway, I have fixed the bug in svnmerge and attached a new version for you
in t
Bernd Schmidt <[EMAIL PROTECTED]> wrote:
> Just tried these instructions on the reload-branch, and it doesn't
> appear to be working as documented:
>
> [EMAIL PROTECTED]:/local/src/egcs/reload-branch> svnmerge.py init
> property 'svnmerge-integrated' set on '.'
This was the correct command to do,
Diego Novillo wrote:
On Tuesday 03 January 2006 12:17, [EMAIL PROTECTED] wrote:
how to keep my branch updated with the mainline?
The easiest way is using svnmerge.py (included in SVN's contrib directory).
There's documentation in the GCC wiki: http://gcc.gnu.org/wiki/SvnBranch
Just tried
On Tuesday 03 January 2006 12:17, [EMAIL PROTECTED] wrote:
> how to keep my branch updated with the mainline?
>
The easiest way is using svnmerge.py (included in SVN's contrib directory).
There's documentation in the GCC wiki: http://gcc.gnu.org/wiki/SvnBranch
All,
I've recently opened a new branch for treegion (tree-region) scheduling.
I'm new at this and was just wondering if someone could tell me how to
keep my branch updated with the mainline?
Thanks,
Chad Rosier
13 matches
Mail list logo
