docs, buildsys: expand on how to pull updates

drop the makefile one, subtree fetch is outdated and it's better to
just pull manually directly

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 69f39588617e9d6e82b8dedef08f838bffb2b141..4425da4076c5f2bd85b48a220cac7d177d82fbcc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,7 @@ DEBS=$(DEB) $(DBG_DEB)
 all: $(DEB)
        @echo $(DEB)
 
-.PHONY: update-subtree deb upload distclean clean dinstall
-
-update-subtree:
-       git subtree fetch $(UPSTREAM) master
-       @printf "\nSubtree fetched, to merge in changes use something like:\n\n"\
-       "\tgit subtree pull -P src --squash $(UPSTREAM) master\n"
+.PHONY: deb upload distclean clean dinstall
 
 buildir: $(BUILDDIR)
 $(BUILDDIR):

diff --git a/README b/README
index bf0f098f7e502b2882da4c58c860661a0ec641eb..d2da346f153e41ef895aa211efe8589e74cae700 100644 (file)
--- a/README
+++ b/README
@@ -8,6 +8,11 @@ networking units link, effectively disabling it.o
 We're using git's subtree functionality, which is basically just a convenience wrapper around the
 age old subtree merge strategy.
 
+The initial addition was done with the following command:
+```
+git subtree add -P src --squash https://salsa.debian.org/debian/ifupdown.git 0.8.36
+```
+
 ## Subtree Rules
 
 * We squash update commits to avoid making the git log explode here, one can always checkout the
@@ -31,3 +36,15 @@ Quoting a tip from `man git-subtree`:
 > will still make sense. But if this isn't important to you, it’s not necessary. git
 > subtree will simply leave out the non-library-related parts of the commit when it
 > splits it out into the subproject later.
+
+## Pull in New Version
+
+Use something like the followign command (adapt the refspec at the end) to pull
+and merge in a new upstream revision:
+
+```
+git subtree pull -P src --squash https://salsa.debian.org/debian/ifupdown.git 0.8.X
+```
+
+Handle merge conflicts and ensure that the *build* post/pre rm scripts don't do anything that would
+interfere with switching to ifupdown2 or purging this package later.