Mirror of the gdb mailing list
 help / color / mirror / Atom feed
From: Kevin Buettner <kevinb@redhat.com>
To: David Carlton <carlton@math.stanford.edu>
Cc: gdb@sources.redhat.com
Subject: Re: branching
Date: Thu, 19 Sep 2002 12:30:00 -0000	[thread overview]
Message-ID: <1020919193025.ZM22088@localhost.localdomain> (raw)
In-Reply-To: David Carlton <carlton@math.stanford.edu> "branching" (Sep 19, 12:12pm)

On Sep 19, 12:12pm, David Carlton wrote:

> And to merge changes in from mainline, here's what I might do, but I'm
> confused by it:
> 
> (All commands assume I'm in the branch's working directory, though it
> shouldn't matter for the first command.)
> 
> 1) Create a tag saying where the merges should end:
> 
>   cvs rtag carlton-dictionary-YYYYMMDD-tag gdb+dejagnu
> 
> 2) Merge in changes from my previous merge tag to the current merge
>    tag:
> 
>   cvs update -j carlton-dictionary-PreviousYYYYMMDD-tag
>     -j carlton-dictionary-YYYYMMDD-tag
> 
>    (The first time I do this, the first -tag will actually be
>    -branchpoint.)

Maybe I'm being naive, but why can't you just checkout your branch,
and then do:

    cvs update -j HEAD

Kevin


  reply	other threads:[~2002-09-19 19:30 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <ro1fzw9h8r2.fsf@jackfruit.Stanford.EDU>
     [not found] ` <20020917143553.GA28408@nevyn.them.org>
     [not found]   ` <ro1k7lkfr5d.fsf@jackfruit.Stanford.EDU>
     [not found]     ` <20020917174928.GA23058@nevyn.them.org>
     [not found]       ` <ro165x4fotl.fsf@jackfruit.Stanford.EDU>
     [not found]         ` <3D87815A.4010807@ges.redhat.com>
2002-09-19 12:12           ` branching David Carlton
2002-09-19 12:30             ` Kevin Buettner [this message]
2002-09-19 12:35               ` branching David Carlton
2002-09-19 13:07                 ` branching Kevin Buettner
2002-09-19 13:12                   ` branching Daniel Jacobowitz
2002-09-19 13:07               ` branching Keith Seitz
2002-09-19 13:11                 ` branching Kevin Buettner
2002-09-19 13:19                   ` branching Keith Seitz
2002-09-19 22:29                     ` branching Daniel Berlin
2002-09-20 17:18                       ` branching Andrew Cagney
2002-09-20 17:45                         ` branching Daniel Berlin
2002-09-19 13:45                 ` branching David Carlton
2002-09-19 14:52                   ` branching Keith Seitz
2002-09-19 15:10                     ` branching David Carlton
2005-02-12  4:24 Branching Russell Shaw
2005-02-13  0:10 Branching Paul Schlie
2005-02-13 11:14 ` Branching Russell Shaw

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1020919193025.ZM22088@localhost.localdomain \
    --to=kevinb@redhat.com \
    --cc=carlton@math.stanford.edu \
    --cc=gdb@sources.redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox