[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --f
From: |
Charles Duffy |
Subject: |
Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix] |
Date: |
Thu, 01 Apr 2004 15:42:10 -0600 |
I suspect that this has been adequately answered already, but just to
flog the dead horse a little harder:
On Thu, 2004-04-01 at 12:44, Juliusz Chroboczek wrote:
> Oh, by the way: there are two things that are easy with cvs that I
> couldn't work out how to do with arch without checking out at least
> one old version. One is
>
> cvs diff -r FOO_0_7_0 -r FOO_0_7_1
>
> which allows me to get a patch between two old versions.
"tla delta foo--release--0.7.0 foo--release--0.7.1 mypatch" will create
a directory "mypatch" which represents the differences in question,
including new/removed/moved files, permissions changes, etc. This can be
viewed with "tla show-changeset" and applied with "tla dopatch".
> The other is
> to generate a patch in which all file deletions and moves are made
> explicit with suppressions and additions. In short, I'm looking for
> an efficient way to do:
>
> tla get foo--release--0.7.0 ,foo-0.7.0
> tla get foo--release--0.7.1 ,foo-0.7.1
> diff -urN -x '*/{arch}/*' ,foo-0.7.0 ,foo-0.7.1
> rm -rf ,foo-0.7.0 ,foo-0.7.1
If you want an original diff-style diff rather than an arch-style
patchdir, then you'll probably end up using exactly what you have, but
modified just a little:
diff -urN -x '*/{arch}/*' "$(tla library-find foo--release--0.7.0--base-0)" \
"$(tla library-find foo--release--0.7.1--base-0)"
Though if you want everything represented nicely, an arch-style diff
(from 'tla delta') is The Right Thing.
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], (continued)
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/03
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], Juliusz Chroboczek, 2004/04/02
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], Aaron Bentley, 2004/04/01
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], Dustin Sallings, 2004/04/01
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], Aaron Bentley, 2004/04/01
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], Dustin Sallings, 2004/04/01
- [Gnu-arch-users] Re: Working out a branching scheme, Neil Stevens, 2004/04/01
- Re: [Gnu-arch-users] Re: Working out a branching scheme, Charles Duffy, 2004/04/01
- Re: [Gnu-arch-users] Re: Working out a branching scheme, Dustin Sallings, 2004/04/01
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/01
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix],
Charles Duffy <=
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], Mikhael Goikhman, 2004/04/01
- Re: [Gnu-arch-users] Working out a branching scheme [was: tag --seal --fix], Aaron Bentley, 2004/04/01
Re: [Gnu-arch-users] tag --seal --fix ?, Andrew Suffield, 2004/04/01
- Re: [Gnu-arch-users] tag --seal --fix ?, Tom Lord, 2004/04/01
- Re: [Gnu-arch-users] tag --seal --fix ?, James Blackwell, 2004/04/02
- Re: [Gnu-arch-users] tag --seal --fix ?, Miles Bader, 2004/04/02
- Re: [Gnu-arch-users] tag --seal --fix ?, Dustin Sallings, 2004/04/02
- Re: [Gnu-arch-users] tag --seal --fix ?, Miles Bader, 2004/04/02
- Re: [Gnu-arch-users] tag --seal --fix ?, Tom Lord, 2004/04/03
Re: [Gnu-arch-users] tag --seal --fix ?, Dustin Sallings, 2004/04/01