Re: Merge and scatter not working
Albert Astals Cid <[email protected]> Mon, 29 Dec 2025 12:42:51 +0100
| Newsgroups | gmane.comp.kde.devel.internationalization-and-documentation |
|---|---|
| Message-ID | <2335983.iZASKD2KPV@xps15> |
El dilluns, 29 de desembre del 2025, a les 12:35:24 (Hora estàndard d’Europa central), Tommi Nieminen va escriure: > Hi, back from Christmas holidays at last… It finally worked! > > Alexander Becker <[email protected]> kirjoitti 23.10.2025 > 18:26:09 > +0100: > > Proposal: > > > > - remove both "l10n-kf5-plasma-lts" and "l10n-kf6-plasma-lts" from your > > "svn up" command line > > I removed not only those but checked every g-n directory’s existence from > the web UI (which I had no knowledge of ;)) and ended up in: > > svn up trunk/{l10n-kde4,l10n-support}/scripts \ > {branches/stable,trunk}/{l10n-kde4,l10n-support}/templates \ > {branches/stable,trunk}/{l10n-kde4,l10n-kf5,l10n-kf6,l10n-support}/fi There is not templates in svn anymore, you need to get it from the new git repository. > > (Maybe someone with permissions could update the KDE TechBase article to > reflect this?) Which article? It's a wiki, i'd say everyone can edit it. Cheers, Albert > > After that, I did this: > > - execute "svn revert . --depth=infinity" to make sure you really have > > nothing in toplevel directories > > …and ran “posummit merge & scatter”, then “svn commit”. *Now* it worked. I > guess the “svn revert” was the one command missing. > > Many thanks to Alexander!