On Tue, 22 Jan 2013 16:59:56 +0100
Oliver Lehmann wrote:
>
> "Joseph A. Nagy, Jr" wrote:
> > I know when I run it manually and there is a conflict, it will
> > tell me about a merge-conflict and ask me which file to keep (mine
> > or theirs), selecting theirs, afaik, overwrites my local file.
>
On 01/22/13 17:21, Joseph A. Nagy, Jr wrote:
On 01/22/13 09:59, Oliver Lehmann wrote:
"Joseph A. Nagy, Jr" wrote:
I know when I run it manually and there is a conflict, it will tell me
about a merge-conflict and ask me which file to keep (mine or theirs),
selecting theirs, afaik, overwrites m
On 01/22/13 09:59, Oliver Lehmann wrote:
"Joseph A. Nagy, Jr" wrote:
I know when I run it manually and there is a conflict, it will tell me
about a merge-conflict and ask me which file to keep (mine or theirs),
selecting theirs, afaik, overwrites my local file.
And when there is no conflict
On 01/22/13 16:59, Oliver Lehmann wrote:
"Joseph A. Nagy, Jr" wrote:
I know when I run it manually and there is a conflict, it will tell me
about a merge-conflict and ask me which file to keep (mine or theirs),
selecting theirs, afaik, overwrites my local file.
And when there is no conflict
"Joseph A. Nagy, Jr" wrote:
I know when I run it manually and there is a conflict, it will tell
me about a merge-conflict and ask me which file to keep (mine or
theirs), selecting theirs, afaik, overwrites my local file.
And when there is no conflict and it can be merged, you have a merged
On 01/22/13 07:00, Oliver Lehmann wrote:
Guido Falsi wrote:
If you use small modifications on a ingle system(or just a few) you
could track the ports tree with subversion, which will be happy to
keep and try to merge your local modifcations. You can also diff and
revert your modifications usi
On 01/22/13 14:00, Oliver Lehmann wrote:
Guido Falsi wrote:
If you use small modifications on a ingle system(or just a few) you
could track the ports tree with subversion, which will be happy to
keep and try to merge your local modifcations. You can also diff and
revert your modifications usi
Guido Falsi wrote:
If you use small modifications on a ingle system(or just a few) you
could track the ports tree with subversion, which will be happy to
keep and try to merge your local modifcations. You can also diff and
revert your modifications using it, which can be quite handy.
Di
On Tue, 22 Jan 2013 13:10:26 +0100
Oliver Lehmann wrote:
> Hi,
>
> in case I made some local modifications to a ports Makefile in
> the past with CVSup it was "easy" to get everything back in-sync by
> just running CVSup. With portsnap fetch update, my modified Makefile
> stays modified. What
On 01/22/13 13:10, Oliver Lehmann wrote:
Hi,
in case I made some local modifications to a ports Makefile in the
past with CVSup it was "easy" to get everything back in-sync by just
running CVSup. With portsnap fetch update, my modified Makefile stays
modified. What is the suggested way in sy
On 01/22/13 13:10, Oliver Lehmann wrote:
Hi,
in case I made some local modifications to a ports Makefile in the
past with CVSup it was "easy" to get everything back in-sync by just
running CVSup. With portsnap fetch update, my modified Makefile stays
modified. What is the suggested way in sy
Hi,
in case I made some local modifications to a ports Makefile in the
past with CVSup it was "easy" to get everything back in-sync by just
running CVSup. With portsnap fetch update, my modified Makefile stays
modified. What is the suggested way in syncing my local portstree 1:1
with
12 matches
Mail list logo
