Date: Wed, 23 Dec 2020 14:59:58 +0000 From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 252054] mergemaster(8) regression after transitioning from svn to git Message-ID: <bug-252054-227-33UKKowdGO@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-252054-227@https.bugs.freebsd.org/bugzilla/> References: <bug-252054-227@https.bugs.freebsd.org/bugzilla/>
index | next in thread | previous in thread | raw e-mail
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054 --- Comment #15 from Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> --- (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 adds "<<<<<<<<<<<<<<<" ">>>>>>>>>>>>>>" to merged files and you have to edit them manually also taking care of these ">>>>>>>>>>>>>>" marks. Is it that big effort to add ident among other gitattributes(5) to have $Is$ tags to this part of sources? They are only needed for the files mergemaster or etcupdate has to cope with. When it's done both tools can be patched manually by FreeBSD enduser if he would care. Even if mergemaster gets deprecated and removed from the base such ident tags in config files will be helpful. How without them would non-committers who update their repositories only occasionally would figure out that the file has changed? -- You are receiving this mail because: You are the assignee for the bug.help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-252054-227-33UKKowdGO>