Hello! I’m looking at how to export patches from the ‘tschwinge/Roger_Whittaker’ branch to continuously test on Hydra whether they still apply to upstream glibc.
To that end, the idea I had was to do something along these lines: git checkout tschwinge/Roger_Whittaker tg export --linearize for-upstream-glibc git checkout for-upstream-glibc git format-patch # (so that the lexicographic order of file names # matches the topological order) However, export fails: --8<---------------cut here---------------start------------->8--- $ tg export --linearize for-upstream-glibc exported commit t/kernel-features.h_includes exported commit t/libc_once exported commit t/struct_stat [...] skip empty commit t/bits_socket.h skip empty commit t/fcntl-internal.h Auto-merging sysdeps/mach/hurd/kernel-features.h CONFLICT (content): Merge conflict in sysdeps/mach/hurd/kernel-features.h fix up the merge and update the index. Don't commit! sh-4.1$ git diff HEAD diff --git a/sysdeps/mach/hurd/kernel-features.h b/sysdeps/mach/hurd/kernel-features.h index e43b0f7..3bef920 100644 --- a/sysdeps/mach/hurd/kernel-features.h +++ b/sysdeps/mach/hurd/kernel-features.h @@ -33,4 +33,7 @@ #endif #define __ASSUME_SOCK_CLOEXEC 1 +<<<<<<< HEAD #define __ASSUME_PIPE2 1 +======= +>>>>>>> 3c430ffa0ee7582f5e146381ebeb105dc2f4ad90 --8<---------------cut here---------------end--------------->8--- And with ‘--quilt’: --8<---------------cut here---------------start------------->8--- $ tg export --quilt for-upstream-glibc Exporting t/init-first.c Exporting t/kernel-features.h_includes Exporting t/libc_once [...] Skip empty patch t/ld.so_auxv Exporting t/grantpt Exporting posix/regex_internal.c/MAX_undefined tg: fatal: cancelling export of t/__i686_defined (-> tschwinge/Roger_Whittaker): branch not up-to-date --8<---------------cut here---------------end--------------->8--- ‘tg patch’ doesn’t even produce a patch: --8<---------------cut here---------------start------------->8--- $ tg patch| cat From: Thomas Schwinge <tho...@schwinge.name> Subject: Roger Whittaker Not for upstream submission. Currently used by Thomas Schwinge for building cross toolchains / testing / development. --- No changes. -- tg: (f09337f..) tschwinge/Roger_Whittaker (depends on: baseline t/init-first.c t/kernel-features.h_includes t/libc_once t/struct_stat t/tls t/tls-threadvar t/tlsdesc.sym t/bits_atomic.h_multiple_threads t/bits_stdio-lock.h t/ptrmangle t/check_native t/_dl_random t/gscope t/strtoul_PLT t/kernel-features.h_includes t/socket_flags t/socketpair_flags t/pipe2 t/dup3 t/accept4 t/bits_sched.h t/dl-sysdep.c_SHARED t/__rtld_lock_recursive_t t/____longjmp_chk t/unwind-resume.c t/extern_inline t/unwind-resume.c t/ld.so_auxv t/grantpt posix/regex_internal.c/MAX_undefined t/__i686_defined) --8<---------------cut here---------------end--------------->8--- A further complication is that ‘tg remote --populate’ did not fetch the ‘baseline’ branch, which is consequently reported as a missing dependency. Running ‘git branch --track baseline origin/baseline’ solves the problem, but doesn’t help ‘export’ and ‘patch’. Any suggestions? Thanks, Ludo’.