Re: Best method to replace a branch's code

[Larry Jones]

Euan Guttridge writes:
> 
> Is there a difference between the below? Thanks
> 
> a) 
> cvs co module1
> cvs up -rHEAD -jHEAD -jbranchB module1
> 
> b)
> cvs co -jbranchB module1

Yes.  The first (which is equivalent to cvs co -jHEAD -jbranchB module1)
undoes any changes between the branch point and the head of the trunk,
the second does not.

-Larry Jones

It doesn't have a moral, does it?  I hate being told how to live my life.
-- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Euan Guttridge]

Hi,

Is there a difference between the below? Thanks

a) 
cvs co module1
cvs up -rHEAD -jHEAD -jbranchB module1

b)
cvs co -jbranchB module1



-Original Message-
From: Derek Robert Price [mailto:[EMAIL PROTECTED]
Sent: 24 March 2004 17:14
To: Larry Jones
Cc: Euan Guttridge; '[EMAIL PROTECTED]'; 'Fabian Cenedese'
Subject: Re: Best method to replace a branch's code


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Larry Jones wrote:

>Derek Robert Price writes:
>
>>cvs up -jbranchA -jbranchB -rbranchA project
>
>
>Isn't that just a long way of doing:
>
>cvs up -rbranchA -jbranchB project
>
>That was my first thought, but it still may require a bit of manual
>intervention.  For example, that won't delete files that exist on
>branchA that have never existed on branchB and you'll get conflicts for
>files that were independently created on both branches.  It is a good
>start, though, and may do the whole job if you're lucky.


No.  The trick to thinking about this is really to visualize only your
destination and your merge endpoints as three distinct snapshots of a
project in time and try to ignore the intervening changes, but I will
draw the branch diagram anyhow.  Assume:

- --X---Y--
   \   \
\   \--branchA-
 \
  \branchB-

`cvs up -rbranchA -jbranchB' will compute the GCA of branchA & branchB
(X in the diagram), computes the diff from X to the tip of branchB, then
merges the result (effectively applying it via the patch program) into
branchA.  This is effectively merging the changes since branchB branched
into branchA and neglecting to remove any changes made to the trunk
since branchB branched or to branchA.

`cvs up -rbranchA -jbranchA -jbranchB', computes the diff from the tip
of branchA to the tip of branchB, then merges the result (again,
effectively applying it via the patch program) into the tip of branchA,
effectively recreating branchB.

In other words, imagine:

echo a whole bunch of junk >file
cp file file2
echo some other junk >>file2
diff -u file file2 >mypatch.diff
patch -p0  file2, then the
resulting patch applied to file, the contents of file now look like file2.

Derek

- --
*8^)

Email: [EMAIL PROTECTED]

Get CVS support at <http://ximbiot.com>!
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQFAYcHDLD1OTBfyMaQRAotOAJ98AHRD3TWxVzv0G6TJxzqEITjwcgCfbtmt
MGps73FhRpKv17Ev2cXwrB8=
=OncB
-END PGP SIGNATURE-



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Fouts Christopher (6452)]

I have a repository called sample, which I tagged as follows...
> cvs rtag -r HEAD t_REL sample

I then created a branch of the files with this tag...
> cvs rtag -r t_REL -b b_DEV sample

Correct?

How do I now tag the HEAD of the b_DEV branch, and subsequently
create a branches from it, say, b_DEV_CF and b_DEV_JS???


-
Chris T Fouts



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Best method to replace a branch's code

[Larry Jones]

Euan Guttridge writes:
> 
> cvs co -rHEAD -jHEAD -jbranchA project
> - applied a sticky tag of 'HEAD' which commiting did not like

cvs co -jHEAD -jbranchA project

Before, we were using -r to get the correct branch, but HEAD is a
revison tag, not a branch tag, and the trunk is the default branch so
you don't need to do anything special to get it.

-Larry Jones

The hardest part for us avant-garde post-modern artists is
deciding whether or not to embrace commercialism.  -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Euan Guttridge]

Thanks for this Derek.. I also tried to apply this for replacing HEAD with a
branch. First attempt of using 

cvs co -rHEAD -jHEAD -jbranchA project
- applied a sticky tag of 'HEAD' which commiting did not like

then; cvs co -jbranchA project
- simply did not merge the branchA changes in

Any thoughts appreciated,
Euan



-Original Message-
From: Derek Robert Price [mailto:[EMAIL PROTECTED]
Sent: 24 March 2004 18:52
To: Larry Jones
Cc: Euan Guttridge; '[EMAIL PROTECTED]'; 'Fabian Cenedese'
Subject: Re: Best method to replace a branch's code


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

I was in a hurry when I wrote this earlier.  The short version is that
the form of the command I suggested is asking CVS to take the changes
that would be necesary to transform point A into point B and merge them
into point A, which, by definition, then transforms point A into point B.

Derek

Derek Robert Price wrote:

> Larry Jones wrote:
>
> Derek Robert Price writes:
>
> >cvs up -jbranchA -jbranchB -rbranchA project
>
>
> Isn't that just a long way of doing:
>
> cvs up -rbranchA -jbranchB project
>
> That was my first thought, but it still may require a bit of manual
> intervention.  For example, that won't delete files that exist on
> branchA that have never existed on branchB and you'll get conflicts for
> files that were independently created on both branches.  It is a good
> start, though, and may do the whole job if you're lucky.
>
>
>
> No.  The trick to thinking about this is really to visualize only your
> destination and your merge endpoints as three distinct snapshots of a
> project in time and try to ignore the intervening changes, but I will
> draw the branch diagram anyhow.  Assume:
>
> --X---Y--
>\   \
> \   \--branchA-
>  \
>   \branchB-
>
> `cvs up -rbranchA -jbranchB' will compute the GCA of branchA & branchB
> (X in the diagram), computes the diff from X to the tip of branchB, then
> merges the result (effectively applying it via the patch program) into
> branchA.  This is effectively merging the changes since branchB branched
> into branchA and neglecting to remove any changes made to the trunk
> since branchB branched or to branchA.
>
> `cvs up -rbranchA -jbranchA -jbranchB', computes the diff from the tip
> of branchA to the tip of branchB, then merges the result (again,
> effectively applying it via the patch program) into the tip of branchA,
> effectively recreating branchB.
>
> In other words, imagine:
>
> echo a whole bunch of junk >file
> cp file file2
> echo some other junk >>file2
> diff -u file file2 >mypatch.diff
> patch -p0 
> Bingo.  Since the diff was determine from file -> file2, then the
> resulting patch applied to file, the contents of file now look like file2.
>
> Derek
>
> --
> *8^)
>
> Email: [EMAIL PROTECTED]
>
> Get CVS support at <http://ximbiot.com>!


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


- --
*8^)

Email: [EMAIL PROTECTED]

Get CVS support at <http://ximbiot.com>!
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQFAYdi6LD1OTBfyMaQRAp8dAKCkrv92ynJ6I07I8iLImhgFNmBS3wCff9HV
pu3FxUhcm8H6ljvSZ6f537U=
=tmAv
-END PGP SIGNATURE-



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Best method to replace a branch's code

[Larry Jones]

Derek Robert Price writes:
> 
> If you still don't believe me, try it.  I've used this previously to
> replace a TRUNK with the source from a branch.  It should work as well
> for a branch to branch replacement.

Indeed.  Now that I've got my head screwed on straight, I concur with
Derek: a two-revision merge should do exactly the right thing.


-Larry Jones

My upbringing is filled with inconsistent messages. -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Best method to replace a branch's code

[Derek Robert Price]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Derek Robert Price wrote:

> I was in a hurry when I wrote this earlier.  The short version is that
> the form of the command I suggested is asking CVS to take the changes
> that would be necesary to transform point A into point B and merge them
> into point A, which, by definition, then transforms point A into point B.


If you still don't believe me, try it.  I've used this previously to
replace a TRUNK with the source from a branch.  It should work as well
for a branch to branch replacement.

Derek
- --
*8^)

Email: [EMAIL PROTECTED]

Get CVS support at !
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQFAYd5MLD1OTBfyMaQRAuzGAJ4hKLWnLSuh3Tx/CbxCwJc2iNMFwQCg7GmY
4c+F6S0f9nOxyfehRnQ3+AA=
=pAZo
-END PGP SIGNATURE-




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Best method to replace a branch's code

[Derek Robert Price]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

I was in a hurry when I wrote this earlier.  The short version is that
the form of the command I suggested is asking CVS to take the changes
that would be necesary to transform point A into point B and merge them
into point A, which, by definition, then transforms point A into point B.

Derek

Derek Robert Price wrote:

> Larry Jones wrote:
>
> Derek Robert Price writes:
>
> >cvs up -jbranchA -jbranchB -rbranchA project
>
>
> Isn't that just a long way of doing:
>
> cvs up -rbranchA -jbranchB project
>
> That was my first thought, but it still may require a bit of manual
> intervention.  For example, that won't delete files that exist on
> branchA that have never existed on branchB and you'll get conflicts for
> files that were independently created on both branches.  It is a good
> start, though, and may do the whole job if you're lucky.
>
>
>
> No.  The trick to thinking about this is really to visualize only your
> destination and your merge endpoints as three distinct snapshots of a
> project in time and try to ignore the intervening changes, but I will
> draw the branch diagram anyhow.  Assume:
>
> --X---Y--
>\   \
> \   \--branchA-
>  \
>   \branchB-
>
> `cvs up -rbranchA -jbranchB' will compute the GCA of branchA & branchB
> (X in the diagram), computes the diff from X to the tip of branchB, then
> merges the result (effectively applying it via the patch program) into
> branchA.  This is effectively merging the changes since branchB branched
> into branchA and neglecting to remove any changes made to the trunk
> since branchB branched or to branchA.
>
> `cvs up -rbranchA -jbranchA -jbranchB', computes the diff from the tip
> of branchA to the tip of branchB, then merges the result (again,
> effectively applying it via the patch program) into the tip of branchA,
> effectively recreating branchB.
>
> In other words, imagine:
>
> echo a whole bunch of junk >file
> cp file file2
> echo some other junk >>file2
> diff -u file file2 >mypatch.diff
> patch -p0 
> Bingo.  Since the diff was determine from file -> file2, then the
> resulting patch applied to file, the contents of file now look like file2.
>
> Derek
>
> --
> *8^)
>
> Email: [EMAIL PROTECTED]
>
> Get CVS support at !


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


- --
*8^)

Email: [EMAIL PROTECTED]

Get CVS support at !
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQFAYdi6LD1OTBfyMaQRAp8dAKCkrv92ynJ6I07I8iLImhgFNmBS3wCff9HV
pu3FxUhcm8H6ljvSZ6f537U=
=tmAv
-END PGP SIGNATURE-




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Best method to replace a branch's code

[Derek Robert Price]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Larry Jones wrote:

>Derek Robert Price writes:
>
>>cvs up -jbranchA -jbranchB -rbranchA project
>
>
>Isn't that just a long way of doing:
>
>cvs up -rbranchA -jbranchB project
>
>That was my first thought, but it still may require a bit of manual
>intervention.  For example, that won't delete files that exist on
>branchA that have never existed on branchB and you'll get conflicts for
>files that were independently created on both branches.  It is a good
>start, though, and may do the whole job if you're lucky.


No.  The trick to thinking about this is really to visualize only your
destination and your merge endpoints as three distinct snapshots of a
project in time and try to ignore the intervening changes, but I will
draw the branch diagram anyhow.  Assume:

- --X---Y--
   \   \
\   \--branchA-
 \
  \branchB-

`cvs up -rbranchA -jbranchB' will compute the GCA of branchA & branchB
(X in the diagram), computes the diff from X to the tip of branchB, then
merges the result (effectively applying it via the patch program) into
branchA.  This is effectively merging the changes since branchB branched
into branchA and neglecting to remove any changes made to the trunk
since branchB branched or to branchA.

`cvs up -rbranchA -jbranchA -jbranchB', computes the diff from the tip
of branchA to the tip of branchB, then merges the result (again,
effectively applying it via the patch program) into the tip of branchA,
effectively recreating branchB.

In other words, imagine:

echo a whole bunch of junk >file
cp file file2
echo some other junk >>file2
diff -u file file2 >mypatch.diff
patch -p0  file2, then the
resulting patch applied to file, the contents of file now look like file2.

Derek

- --
*8^)

Email: [EMAIL PROTECTED]

Get CVS support at !
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQFAYcHDLD1OTBfyMaQRAotOAJ98AHRD3TWxVzv0G6TJxzqEITjwcgCfbtmt
MGps73FhRpKv17Ev2cXwrB8=
=OncB
-END PGP SIGNATURE-




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Best method to replace a branch's code

[Larry Jones]

Derek Robert Price writes:
> 
> cvs up -jbranchA -jbranchB -rbranchA project

Isn't that just a long way of doing:

cvs up -rbranchA -jbranchB project

That was my first thought, but it still may require a bit of manual
intervention.  For example, that won't delete files that exist on
branchA that have never existed on branchB and you'll get conflicts for
files that were independently created on both branches.  It is a good
start, though, and may do the whole job if you're lucky.

-Larry Jones

My dreams are getting way too literal. -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Best method to replace a branch's code

[Derek Robert Price]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Jim.Hyslop wrote:

>No, you will only get conflicts if you update from within the branch.
Fabi's
>approach will work, except you should probably add a step to delete all
>working files in B before copying files from A.


I'm telling you:

cvs up -rbranchA -jbranchA -jbranchB
cvs commit

No conflicts.  No manual adding/removing.  It just works.

Derek

- --
*8^)

Email: [EMAIL PROTECTED]

Get CVS support at !
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQFAYb7WLD1OTBfyMaQRAmlYAKDfnFfyCPgjAKD+lxuxKaLSDu/HcACgnm0o
smbJk815oxs0QMEWrVaL1JM=
=/+ew
-END PGP SIGNATURE-




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Jim.Hyslop]

[bottom-quoting corrected]
> From: [EMAIL PROTECTED]
> [mailto:[EMAIL PROTECTED]
>  Behalf Of
> Fabian Cenedese
> Checkout branchB, export branchA, copy all A files to B 
> sandbox, commit.
> (And maybe add/remove files first).
> 
> bye  Fabi

Euan Guttridge wrote:
> that solution would flag conflicts, I just want a no 
> questions replace..
No, you will only get conflicts if you update from within the branch. Fabi's
approach will work, except you should probably add a step to delete all
working files in B before copying files from A.

-- 
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Andy Jones]

>that solution would flag conflicts, I just want a no questions replace..

It wouldn't, you know.  
To CVS it would be exactly as if you had made the changes manually.





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Fouts Christopher (6452)]

Yep I believe this will work!

-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On Behalf
Of Fabian Cenedese
Sent: Wednesday, March 24, 2004 10:30 AM
To: '[EMAIL PROTECTED]'
Subject: RE: Best method to replace a branch's code



>thanks but I need to retain branchA and branchB - just overwrite 
>branchB with code from branchA

Checkout branchB, export branchA, copy all A files to B sandbox, commit.
(And maybe add/remove files first).

bye  Fabi




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Euan Guttridge]

that solution would flag conflicts, I just want a no questions replace..


-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] Behalf Of
Fabian Cenedese
Sent: 24 March 2004 15:30
To: '[EMAIL PROTECTED]'
Subject: RE: Best method to replace a branch's code



>thanks but I need to retain branchA and branchB - just overwrite branchB
>with code from branchA

Checkout branchB, export branchA, copy all A files to B sandbox, commit.
(And maybe add/remove files first).

bye  Fabi




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Best method to replace a branch's code

[Derek Robert Price]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

cvs up -jbranchA -jbranchB -rbranchA project
cvs commit

Of course, why in the world you would want to do that, I have no idea.
You already have a copy of the code from branchB in branchB.  If you
wanted a second branch, why not just rebranch it?  Anyhow, there it is.

Derek

- --
*8^)

Email: [EMAIL PROTECTED]

Get CVS support at !
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQFAYbOtLD1OTBfyMaQRAtnuAKCAmMustZMJ4dsfsVk7aoZGTlD7VACdEpZo
SMEEc+VN7dJYQ6KZhNMq8Gw=
=ohvW
-END PGP SIGNATURE-




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Fouts Christopher (6452)]

Ahhh, totally new meaning. I don't have a "simple" solution
to this. You almost need to write a script that would "cp -Rf"
the files from brachA to branchB.

-chris

-Original Message-
From: Euan Guttridge [mailto:[EMAIL PROTECTED] 
Sent: Wednesday, March 24, 2004 10:03 AM
To: 'Fouts Christopher (6452)'; '[EMAIL PROTECTED]'
Subject: RE: Best method to replace a branch's code


thanks but I need to retain branchA and branchB - just overwrite branchB
with code from branchA

Euan

-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] Behalf Of
Fouts Christopher (6452)
Sent: 24 March 2004 14:24
To: '[EMAIL PROTECTED]'
Subject: RE: Best method to replace a branch's code


Doh, my bad! However isn't renaming the branch the
simplest approach?

-chris

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] 
Sent: Wednesday, March 24, 2004 9:14 AM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: Re: Best method to replace a branch's code


"Fouts Christopher (6452)" writes:
>  
> First rename branchA to branchX
>  
> > cvs tag -r branchA branchX

That doesn't rename the branch, it tags the head revision on the branch. To
rename a branch you have to use cvs admin -n.

-Larry Jones

Nobody knows how to pamper like a Mom. -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Fabian Cenedese]

>thanks but I need to retain branchA and branchB - just overwrite branchB
>with code from branchA

Checkout branchB, export branchA, copy all A files to B sandbox, commit.
(And maybe add/remove files first).

bye  Fabi




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Euan Guttridge]

thanks but I need to retain branchA and branchB - just overwrite branchB
with code from branchA

Euan

-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] Behalf Of
Fouts Christopher (6452)
Sent: 24 March 2004 14:24
To: '[EMAIL PROTECTED]'
Subject: RE: Best method to replace a branch's code


Doh, my bad! However isn't renaming the branch the
simplest approach?

-chris

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] 
Sent: Wednesday, March 24, 2004 9:14 AM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: Re: Best method to replace a branch's code


"Fouts Christopher (6452)" writes:
>  
> First rename branchA to branchX
>  
> > cvs tag -r branchA branchX

That doesn't rename the branch, it tags the head revision on the branch. To
rename a branch you have to use cvs admin -n.

-Larry Jones

Nobody knows how to pamper like a Mom. -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Andy Jones]

Errr... is it safe to rename branch tags?

My suggestion:  get a list of the files that will change, and delete those files in 
branch A's sandbox before the merge.
Disclaimer: I've not tested this!


At 01:47 pm 24/3/04, Fouts Christopher (6452) wrote:
>Will renaming the branches work?
> 
>First rename branchA to branchX
> 
>> cvs tag -r branchA branchX
> 
>Then rename branchB to branchA
> 
>> cvs tag -r branchB branchA
> 
>-chris
>-Original Message-
>From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Euan Guttridge
>Sent: Wednesday, March 24, 2004 6:32 AM
>To: '[EMAIL PROTECTED]'
>Subject: Best method to replace a branch's code
>
>What is the best method to *replace* code on branchA with that on branchB? Note not a 
>merge, a straight replace.
> 
>Thanks
>Euan
> 
>
>___
>Info-cvs mailing list
>[EMAIL PROTECTED]
>http://mail.gnu.org/mailman/listinfo/info-cvs




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: Best method to replace a branch's code

[Larry Jones]

"Fouts Christopher (6452)" writes:
>  
> First rename branchA to branchX
>  
> > cvs tag -r branchA branchX

That doesn't rename the branch, it tags the head revision on the branch.
To rename a branch you have to use cvs admin -n.

-Larry Jones

Nobody knows how to pamper like a Mom. -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Fouts Christopher (6452)]

Doh, my bad! However isn't renaming the branch the
simplest approach?

-chris

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] 
Sent: Wednesday, March 24, 2004 9:14 AM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: Re: Best method to replace a branch's code


"Fouts Christopher (6452)" writes:
>  
> First rename branchA to branchX
>  
> > cvs tag -r branchA branchX

That doesn't rename the branch, it tags the head revision on the branch. To
rename a branch you have to use cvs admin -n.

-Larry Jones

Nobody knows how to pamper like a Mom. -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: Best method to replace a branch's code

[Fouts Christopher (6452)]

Title: Message



Will 
renaming the branches work?
 
First 
rename branchA to branchX
 
    > cvs tag -r branchA 
branchX
 
Then 
rename branchB to branchA
 
    > cvs tag -r branchB 
branchA
 
-chris

  
  -Original Message-From: 
  [EMAIL PROTECTED] 
  [mailto:[EMAIL PROTECTED] On Behalf 
  Of Euan GuttridgeSent: Wednesday, March 24, 2004 6:32 
  AMTo: '[EMAIL PROTECTED]'Subject: Best method to replace 
  a branch's code
  What is 
  the best method to *replace* code on branchA with that on branchB? Note not a 
  merge, a straight replace.
   
  Thanks
  Euan
   
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs