This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Merge public sources to my local tree


On Donnerstag, 22. Mai 2003 17:42, Daniel Néri wrote:
> Roland Caßebohm <roland.cassebohm@visionsystems.de> writes:
> > this is very interesting for me, how do you do that?  How can I
> > merge public sources to my local tree
>
> Import the public sources on a vendor branch using the "cvs import"
> command, e.g.:
>
>   $ cvs -d /path/to/repository im -m "eCos anonCVS from 2003-05-22." \
>       redhat/ecos redhat ecos-current-2003-05-22
>
> Then chdir into your working copy, and use "cvs update", using the tag
> from the previous import and the tag from this last one to merge the
> vendor branch with your local trunk:
>
>   $ cd /path/to/working/copy
>   $ cvs up -Pd -jecos-current-2003-05-19 -jecos-current-2003-05-22
>
> Proceed to resolve conflicts, if any, and commit:
>
>   $ cvs ci -m "Merge with vendor branch."
>
> > and how can I make diffs from my local tree against the public?
>
> Use "cvs diff" and the vendor branch tag, e.g. using my examples
> above:
>
>   $ cvs diff -rredhat
>
>
> Best wishes,

Thank you, I think this will help me,

Roland


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]