Re: [Arx-users] Flailing around, and a segfault

[Walter Landry]

Kevin Smith <address@hidden> wrote:
> On Mon, 2004-12-06 at 22:16 -0500, Walter Landry wrote:
> > Kevin Smith <address@hidden> wrote:
> > > So I'm trying to understand how to interact with a remote archive
> > > (wlandry arx, in this case). The example on the ArX web site tells you
> > > how to get a readonly copy, but not how to fork it so you can work on a
> > > branch. Same with section 4.4 of the manual.
> > > 
> > > I did a "get", and then a "fork", and I was able to commit changes to my
> > > local archive. But now I can't see how to merge the latest stuff off
> > > ~wlandry. The answers might be in the docs, but I'm not seeing them. The
> > > built-in --help commands are just a bit too terse. In particular, they
> > > could use examples of what a [REVISION] might look like, or a [branch].
> > 
> > The command to merge is "merge".
> 
> Ok. I'm guessing I want the --in-place variant. I have absolutely no
> idea what to put in for the mainline and sibling. I my mind, the
> mainline would be somewhere over on ~wlandry, and the sibling would be
> in my local archive. But since my commits go to my local archive, maybe
> it's now my mainline?
> 
> (Checking the docs...)

The help page could definitely use an example.

> address@hidden arx.old $ arx missing address@hidden
> address@hidden arx.old $ arx missing address@hidden/arx
> address@hidden arx.old $ arx missing address@hidden/arx.2.1
> address@hidden/arx.2.1,119
> address@hidden/arx.2.1,120
> address@hidden/arx.2.1,121
> address@hidden/arx.2.1,122
> address@hidden/arx.2.1,123
> address@hidden/arx.2.1,124
> 
> ...third time's a charm. Again, more output would be helpful.

Yes.  This is another case of not complaining when there are no
revisions in those branches.

> Let's try the merge:
> 
> address@hidden arx.old $ arx merge address@hidden/arx.2.1
> No merge done.  Sibling is the same as the mainline
>         address@hidden/arx.kevins,0
> Problem copying a file:
> boost::filesystem::copy_directory
> /home/kevins/work/arx.old
> address@hidden/arx.2.1
> 
> Doh! I forgot --in-place. With that, it chugs for a while...maybe a
> minute or two. Then we have some conflicts. Hm. That output could be
> cleaned up a bit, and the identical change probably should have been
> auto-resolved.

That would be bug #10306 (3-way merges).

> But I guess it worked, and I was able to commit. Whew.

<snip>

> > > How can I view the checkin history of a single file? In particular, if
> > > I'm working in my own branch of the ArX code, how can I view the history
> > > of the file prior to my branching?
> > 
> > You can run "arx changelog" and search it for that particular file.
> 
> I suspect you meant: arx log --formatted

Yes.

> > Then you can read the log for that revision to maybe get an idea of
> > what happened.  However, what you really want is an "annotate"
> > command.  That is on the TODO (after Windows/OS X support and the new
> > tag mechanism).
> 
> Yup. That is what I want. It's another thing I might be able to take a
> stab at implementing.

It should not be all that hard, but it is work.  The way I envision
it, you would scan the patch logs to find when a file was patched,
moved, or (in the future) copied.  Then you get those patches and
manually read them to figure out the annotations.  This only works for a
single line of development, but it should be good enough for a while.

Walter