[opensuse-buildservice] Branched package contains both sources and _link after "baserev update..."
Hi all, I had branched a package, made some changes to it and submitted them. Now that the changes have been accepted my package has been updated, and now contains both _link and source files when "unexpanding" my working copy. https://build.opensuse.org/package/show/home:ojkastl_buildservice:fingerprin... So basically a "osc up -u" and "osc up -e " only create or remove the _link file, while everything else stays in place. Am I missing something or is this not what normally happens on branched/linked packages? Kind Regards, Johannes -- Johannes Kastl Linux Consultant & Trainer Tel.: +49 (0) 151 2372 5802 Mail: kastl@b1-systems.de B1 Systems GmbH Osterfeldstraße 7 / 85088 Vohburg http://www.b1-systems.de GF: Ralph Dehner Unternehmenssitz: Vohburg / AG: Ingolstadt,HRB 3537
On Montag, 2. Dezember 2019, 20:16:57 CET Johannes Kastl wrote:
Hi all,
I had branched a package, made some changes to it and submitted them. Now that the changes have been accepted my package has been updated, and now contains both _link and source files when "unexpanding" my working copy.
https://build.opensuse.org/package/show/home:ojkastl_buildservice:fingerprin...
So basically a "osc up -u" and "osc up -e " only create or remove the _link file, while everything else stays in place.
seems to be fine.
Am I missing something or is this not what normally happens on branched/linked packages?
looks all normal. A branch is a link + full copy to be able to do a merge with higher chances to solve conflicts automatically. This is also like other scm's (git/svn) are workering. -- Adrian Schroeter <adrian@suse.de> Build Infrastructure Project Manager SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nuernberg, Germany (HRB 247165, AG München), Geschäftsführer: Felix Imendörffer -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
Hi Adrian, Am 03.12.19 um 07:57 schrieb Adrian Schröter:
looks all normal. A branch is a link + full copy to be able to do a merge with higher chances to solve conflicts automatically. This is also like other scm's (git/svn) are workering.
Thanks for checking. I was just confused because links do not have that "full copy" part, and I mostly use links, not branches... Johannes -- Johannes Kastl Linux Consultant & Trainer Tel.: +49 (0) 151 2372 5802 Mail: kastl@b1-systems.de B1 Systems GmbH Osterfeldstraße 7 / 85088 Vohburg http://www.b1-systems.de GF: Ralph Dehner Unternehmenssitz: Vohburg / AG: Ingolstadt,HRB 3537
participants (2)
-
Adrian Schröter -
Johannes Kastl