[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Thierry Thomas changed: What|Removed |Added See Also||https://bugs.freebsd.org/bu

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Thierry Thomas changed: What|Removed |Added See Also||https://bugs.freebsd.org/bu

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Marek Zarychta changed: What|Removed |Added Status|Open|Closed Resolution|---

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #15 from Marek Zarychta --- (In reply to Kyle Evans from comment #13) If mergemaster(8) gets deprecated then people would say goodbye to it and will struggle with etcupdate(8). Mergemaster does the merge side by side, etcupdate

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #14 from Mark Millard --- (In reply to Kyle Evans from comment #13) I'm not aware of documentation of the equivalents for etcupdate use to the standard documentation's use of specific mergemaster commands for variations of the

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #13 from Kyle Evans --- There's a very real chance that mergemaster could just get deprecated here instead. As I mentioned on IRC, you should give etcupdate a shot. -- You are receiving this mail because: You are the assignee

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #12 from Mark Linimon --- (In reply to Marek Zarychta from comment #11) freebsd-update is not available for many (all?) of our tier-2 architectures. -- You are receiving this mail because: You are the assignee for the bug. __

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #11 from Marek Zarychta --- (In reply to Thierry Thomas from comment #10) Yes, I closed the bug with this comment. But comment #8 says that not everyone is willing to use only freebsd-update to update the system, so the bug got

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Thierry Thomas changed: What|Removed |Added CC||thie...@freebsd.org --- Comment #

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Marek Zarychta changed: What|Removed |Added Attachment #220828|0 |1 is obsolete|

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Marek Zarychta changed: What|Removed |Added Status|Closed |Open Resolution|Overcome

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Mark Millard changed: What|Removed |Added CC||marklmi26-f...@yahoo.com --- Commen

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Marek Zarychta changed: What|Removed |Added Status|New |Closed Resolution|---

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #6 from Marek Zarychta --- (In reply to Marek Zarychta from comment #5) I blindly assumed that timestamps in TEMPROOT dir will be preserved but it's completely wrong assumption making this workaround useless. The files are not j

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Marek Zarychta changed: What|Removed |Added Attachment #220827|0 |1 is obsolete|

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #4 from Marek Zarychta --- Created attachment 220827 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=220827&action=edit Ugly hack for mergemaster(8) to workaround Id removal With this patch running "mergemaster -UFi"

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Marek Zarychta changed: What|Removed |Added Attachment #220823|mergemaster run with -F |mergemaster run with -FU d

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #3 from Marek Zarychta --- The behaviour of mergemaster is fine. The drawback is that you need to reserve a lot more time to update config files with mergemaser and the option -F became useless. -- You are receiving this mail

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #2 from Kyle Evans --- (In reply to Kyle Evans from comment #1) The behavior is less gross than I stated in that comment, but I did weird stuff here where strict would've been a better default. -- You are receiving this mail

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Kyle Evans changed: What|Removed |Added CC||kev...@freebsd.org --- Comment #1 fro

[Bug 252054] mergemaster(8) regression after transitioning from svn to git

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 Bug ID: 252054 Summary: mergemaster(8) regression after transitioning from svn to git Product: Base System Version: Unspecified Hardware: Any OS: Any