[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --f
From: |
Stefan Monnier |
Subject: |
[Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix] |
Date: |
04 Apr 2004 23:56:36 -0400 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
> What people want is something that will let them look at "foo.c" and
> see (something like:)
> int
> some_fn ()
> {
> static int x = 0;
>>>>>>> base-0 (address@hidden, 12-14-1981)
> return x;
> ------ patch-1 (address@hidden, 1-13-1982)
> return ++x;
> ------ patch-2 (address@hidden, 1-15-1982)
> return x++;
>>>>>>>
> }
I indeed want the above. Currently I do it with the following one-liner:
--- orig/libarch/apply-changeset.c
+++ mod/libarch/apply-changeset.c
@@ -2147,7 +2147,7 @@
*(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) =
cfg__gnu_diff3;
- *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-E";
+ *(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-A";
*(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "--merge";
*(t_uchar **)ar_push ((void **)&argv, 0, sizeof (char *)) = "-L";
Then I open the file in Emacs and smerge-mode automatically comes up
and lets me select which version I want. ;-)
> I don't either. I think they are mostly overrated. But it is a very
I don't use `cvs annotate' very often, but when I do, I really
appreciate it. The situation is typically that I'm look at a piece of code
which makes no sense to me and I want to find the history of that
particular piece of code (rather than history of the whole file).
So `tla annotate' is probably not the best answer to my problem:
I'd probably rather have something like `tla lines-history FILE N M' which
shows me the log comments and the diff-hunks that have affected the lines
N to M of file FILE. And this might actually be easier to produce directly
from an Arch archive without having to build huge revlib trees.
Stefan
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], (continued)
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/03
- [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Stefan Monnier, 2004/04/02
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/03
- [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Stefan Monnier, 2004/04/03
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/04
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Aaron Bentley, 2004/04/04
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/04
- [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Stefan Monnier, 2004/04/04
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Aaron Bentley, 2004/04/04
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/04
- [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix],
Stefan Monnier <=
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Stefan Monnier, 2004/04/04
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/04
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Juliusz Chroboczek, 2004/04/04
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/04
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Juliusz Chroboczek, 2004/04/05
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/05
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], James Blackwell, 2004/04/04
- Re: [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Tom Lord, 2004/04/04
- [Gnu-arch-users] cscvs version splitting [was Re: Working out a branching scheme], Charles Duffy, 2004/04/05
- [Gnu-arch-users] Re: Working out a branching scheme [was: tag --seal --fix], Stefan Monnier, 2004/04/04