[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freebsd-hackers
Subject:    (solved) Re: Huge mergeinfo list after merge from vendor branch
From:       Stefan_Eßer <se () freebsd ! org>
Date:       2020-07-11 7:49:16
Message-ID: a9045c48-ca7a-9980-6a15-5aac385cf889 () freebsd ! org
[Download RAW message or body]

Am 11.07.20 um 01:50 schrieb Rodney W. Grimes:
> > 
> > > On Jul 10, 2020, at 12:21 PM, Simon J. Gerraty via freebsd-hackers \
> > > <freebsd-hackers@freebsd.org> wrote: 
> > > Rodney W. Grimes <freebsd-rwg@gndrsh.dnsmgr.net> wrote:
> > > > Was a merge done from the wrong working directory?
> > > > Merges need to be done while cwd is the top level of the src tree.
> > > 
> > > Pretty sure the examples in the svn primer show
> > > 
> > > 	cd contrib/foo
> > > 	svn merge ^/vendor/FOO/foo/dist .
> > > 
> > > if that's not correct, and update would be useful.
> > 
> > Hi,
> > 	What sjg@ pointed out is the proper way to handle vendor updates/imports.
> > Thanks so much!
> 
> I wonder if it is because of a svn copy that was done to
> originally create contrib/foo rather than an svn merge?

I have no idea whether the cause was the SVN copy, but the mergeinfo
was in no way related to the files that had been provided in the
contrib area with SVN copy.

The mergeinfo was for other paths ending in contrib/bc in project and
user directories, completely unrelated to what I'm working in.

Anyway, I deleted the mergeinfo from that directory (not the root of
the source tree, of course) and recreated the correct mergeinfo with
"merge --record-only" from the vendor directory.

The resulting mergeinfo looked sane and I have performed the commit.

Thank you for your replies on this topic and best regards, STefan
_______________________________________________
freebsd-hackers@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org"


[prev in list] [next in list] [prev in thread] [next in thread]