[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-gnu-arch] [bug #4924] log-for-merge bug
From: |
nobody |
Subject: |
[Bug-gnu-arch] [bug #4924] log-for-merge bug |
Date: |
Fri, 22 Aug 2003 13:17:15 -0400 |
User-agent: |
Mozilla/4.76 [en] (X11; U; FreeBSD 3.0-RELEASE i386) |
=================== BUG #4924: FULL BUG SNAPSHOT ===================
http://savannah.gnu.org/bugs/?func=detailbug&bug_id=4924&group_id=4899
Submitted by: tomlord Project: GNU arch -- a revision control
system
Submitted on: Fri 08/22/2003 at 10:17
Category: tla Severity: 5 - Major
Bug Group: bug Resolution: None
Status: Open Release:
Fixed Release: Merge Request?: None
Your Archive Name: Your Archive Location:
Assigned to: tomlord
Summary: log-for-merge bug
Original Submission: From: Giles Lean <address@hidden>
More on the log-for-merge bug I've stumbled over: here's a recipe to
reproduce the problem. It's a bit long winded -- doubtless once the
bug is identified a smaller example can be constructed.
I'll look at the source for this if nobody does before me, but
my tla interrupt stack is a bit deep at the moment so that won't
be for a few days.
This example is based on the tla tutorial: in particular, the hw.c
and main.c are those from the example, and the edits made for the
three patches by Alice and Bob are those made in the tutorial.
I've tried to keep this as simple and self contained as possible
otherwise -- no default archive used, and everything spelt out.
I am using a tla 1.1 build of a couple of days ago:
$ tla --version
tla address@hidden/dists--devo--1.0--patch-35(emf.net/devo.tla) from regexps.com
I have tested on NetBSD-1.6.1/i386 and Red Hat Linux 9 with the
identical results.
tla my-default-archive -d
tla make-archive
address@hidden
~/{archives}/2003-example
tla archive-setup
address@hidden/hello-world--mainline--0.1
#
# Create a working directory and populate it with hw.c and main.c
# in their initial form, including 'arch-tag: ...' lines.
#
tla init-tree
address@hidden/hello-world--mainline--0.1
tla tagging-method tagline
tla make-log # edit ...
tla import
#
# Create patch-1:
#
# edit hw.c to fix the "hello world" string
#
tla make-log # edit ...
tla commit
#
# tla revisions will now show base-0 and patch-1
#
tla revisions
base-0
patch-1
#
# create a new archive (as the tutorial does; retesting
# using the same archive might be interesting too)
#
tla make-archive
address@hidden
~/{archives}/2003-candice
#
# Create a branch, and tag it with ...--patch-1
#
tla archive-setup
-A address@hidden
hello-world--andrea--0.1
tla tag
-A address@hidden
address@hidden/hello-world--mainline--0.1--patch-1
hello-world--andrea--0.1
#
# Edit main.c and commit as patch-2 in hello-world--mainline--0.1
#
tla make-log # edit
tla commit
#
# create another branch and tag as before (still ...--patch-1)
#
tla archive-setup
-A address@hidden
hello-world--caroline--0.1
tla tag
-A address@hidden
address@hidden/hello-world--mainline--0.1--patch-1
hello-world--caroline--0.1
#
# Edit hw.c and main.c to add "copywrong" and commit as patch-3
#
tla make-log # edit ...
tla commit
#
# create a third branch and tag it, again from patch-1
#
tla archive-setup
-A address@hidden
hello-world--sharon--0.1
tla tag
-A address@hidden
address@hidden/hello-world--mainline--0.1--patch-1
hello-world--sharon--0.1
#
# Leave the working directory with hw.c and main.c in it, and
# 'get' each branch, update it, and look at 'tla log-for-merge'
# output. Note that patch-2 and patch-3 are applied in each
# case.
#
tla get
address@hidden/hello-world--andrea--0.1
hw-andrea
tla get
address@hidden/hello-world--caroline--0.1
hw-caroline
tla get
address@hidden/hello-world--sharon--0.1
hw-sharon
tla replay
--in-place -A address@hidden
hw-andrea
hello-world--mainline--0.1
tla replay
--in-place -A address@hidden
hw-caroline
hello-world--mainline--0.1
tla replay
--in-place -A address@hidden
hw-sharon
hello-world--mainline--0.1
#
# Now, run log-for-merge and notice the different output:
#
$ tla log-for-merge -d hw-andrea
Patches applied:
* address@hidden/hello-world--mainline--0.1--patch-2
comment exit from main
* address@hidden/hello-world--mainline--0.1--patch-3
copywrong
$ tla log-for-merge -d hw-caroline
Patches applied:
* address@hidden/hello-world--mainline--0.1--patch-3
copywrong
$ tla log-for-merge -d hw-sharon
<no output>
Giles
--
Giles Lean <address@hidden>
_______________________________________________
arch-users mailing list
address@hidden
http://lists.fifthvision.net/mailman/listinfo/arch-users
No Followups Have Been Posted
CC list is empty
No files currently attached
For detailed info, follow this link:
http://savannah.gnu.org/bugs/?func=detailbug&bug_id=4924&group_id=4899
_______________________________________________
Message sent via/by Savannah
http://savannah.gnu.org/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Bug-gnu-arch] [bug #4924] log-for-merge bug,
nobody <=