[fpc-devel] Submitting patches using git
Ryan Joseph
genericptr at gmail.com
Sat Jul 20 22:27:54 CEST 2019
> On Jul 20, 2019, at 4:12 PM, denisgolovan <denisgolovan at yandex.ru> wrote:
>
> Have you renamed your branch?
> Last time you mentioned it was "gen-const-new”.
The branch is called “generic_constants” but I’m making temporary copies for testing so I don’t mess up the safe one.
> And you didn't include enough log to see origin/master (see in brackets like in your first commit).
>
> Again your commits should be at the top of origin/master if "git rebase" did its job correctly without any conflicts.
> If you have conflicts, you need to resolve them one by one and do "git rebase --continue" each time.
Here’s a full log until my initial commit. You can see I haven’t merged updates from the main repo since 2018.
If you scroll down you’ll see I made a new branch from generic_constants called “generic_constants_rebase” and then did "git rebase master”. At this point it’s giving me a conflict which is from an old commit (I think from the line "Patch failed at 0005”). It like the old commit is conflicting with something from master but why is it looking at old commits?
Ryans-MacBook-Pro-2:fpc-git ryanjoseph$ git log --graph
* commit c5a6c2c0822d6c869a788a98a144e739a97d517a (HEAD -> generic_constants, origin/generic_constants)
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Sat Jul 20 09:40:58 2019 -0400
|
| fixed bugs with range checking and constants + added 2 tests
|
* commit 49de8113a1eb29b368d89d9e2fb7fa7c932d937e
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Mon Mar 25 10:35:47 2019 -0400
|
| reverted back bad line endings in htypechk.pas
|
* commit 128d695bf83fb19de342d8e23101ec0223e08e1b
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Fri Mar 22 13:10:12 2019 -0400
|
| added 2 more tests
|
* commit 4dcdd8932d5bc50b5d87bc8e1f1a7ea4e6d5b29f
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Mar 19 09:18:39 2019 -0400
|
| Fixed more operator bugs and added test
|
* commit f2039f13c74e74cb523076b27ff6559ae69ad7d1
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Sun Mar 17 16:26:40 2019 -0400
|
| Fixed binary op bugs and constant assignment bugs, added tests
|
* commit 053be315080c47dea68aa52c020fcbe23225d1d3
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Sat Feb 23 15:01:58 2019 -0500
|
| better const compare in compare_defs_ext, added tests
|
* commit 7f234fad6b503c0374320a81eb45d9c4e4327734
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Sat Feb 16 16:27:28 2019 -0500
|
| fixed tests
|
* commit d9cb1e6d09df6389e6f4b234ed4a13d5b2b111be
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Sat Feb 16 16:00:07 2019 -0500
|
| fixed "class procedure" bug, cleaned up some type cast errors
|
* commit 2efec219041f23036508f9a35b8a7492404f29a8
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Fri Feb 15 11:00:20 2019 -0500
|
| fixed .gitignore so tests are included
|
* commit 902c7151151ccb96f2825a6eede493e9bc88af72
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Mon Feb 11 11:27:37 2019 -0500
|
| def compare for specialized refs with constants
|
* commit 3dcffa470383e81d0b287ed2c27e9b6f66362014
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Sat Feb 9 17:06:54 2019 -0500
|
| adding constant type/range checking
|
* commit 02e9456d351fb6bdeac15cf14c4e50920a718a83
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Mon Jan 7 11:18:17 2019 -0700
|
| minor bug fixes
|
* commit bd76667453914106a51d31672d841b1344066e6a
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Sun Jan 6 17:49:15 2019 -0700
|
| Removed tgenericparamdef and defs from tspecializationcontext, changed separator syntax
|
* commit 3ad83ffed75b20b8f52a823452824b9eaae31ee8
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 27 19:53:24 2018 +0700
|
| bug fix
|
* commit 3a6b595ade54ff8b7b052221d28d1fb551a9fc7e
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 27 12:45:52 2018 +0700
|
| changed const generic params to tconstsym
|
* commit d71e8383ebe679926598e690956b97055fada833
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 27 08:59:05 2018 +0700
|
| Removed tgenericparamsym* types
|
* commit 21181027340e5ab6f25f9350217ed1d4942f1e1e
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Wed Nov 14 09:19:57 2018 +0700
|
| Bug in string const constraints
|
* commit 9b2190a54dff16630ea1788ab408095bd7535547
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 13 19:11:21 2018 +0700
|
| Updated ppu version
|
* commit b9ff43058fe98c4e3ad176953dad5413091b1676
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 13 16:10:00 2018 +0700
|
| Removed type
|
* commit d84930722cd94fff57638c55e1c84d48c321f104
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 13 16:08:54 2018 +0700
|
| Const type restrictions
|
* commit b1483f95a0636b9f29fbdc875d17b09143bbd9ea
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 13 10:45:16 2018 +0700
|
| removed .gitignore
|
* commit 4e43439973af1413fbedb5c0b78cc60f668393e9
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 13 10:44:29 2018 +0700
|
| Generic const params can be assigned to struct consts, PPU loading, all const types accepted
|
* commit e2f86ae6e5c3c52d123e3e8b32103f5136b75cf2
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Sat Nov 10 10:20:52 2018 +0700
|
| Fixed bug in type constraints, added templates for non-int consts
|
* commit bf9396f1c811839707c98dd331b3432d3b55d8d1
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 19:55:24 2018 +0700
|
| bug with const param validation
|
* commit 808e63ded8053c45f21eb4397eac8632ac8f058e
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 15:53:53 2018 +0700
|
| Bug with nested const params
|
* commit 7d924cdf5359fb55bf709febe6ab9c39bb440933
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 11:18:32 2018 +0700
|
| Added const for params, disabled in mode delphi
|
* commit ec518542b2da7d7f016702a82b2d05349a01a6fb
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 6 13:58:49 2018 +0700
|
| first commit
|
* commit d5219e371d1048ff45d345237193859910c7bdaa
| Author: Mattias Gaertner <nc-gaertnma at netcologne.de>
| Date: Tue Jul 24 15:47:18 2018 +0000
|
| pastojs: changed logo
|
| git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@39507 3ad0048d-3df7-0310-abae-a5850022a9f2
|
======================================================
Ryans-MacBook-Pro-2:fpc-git ryanjoseph$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: first commit
Using index info to reconstruct a base tree...
M compiler/pgenutil.pas
Falling back to patching base and 3-way merge...
Auto-merging compiler/pgenutil.pas
Applying: Added const for params, disabled in mode delphi
Using index info to reconstruct a base tree...
M compiler/pgenutil.pas
.git/rebase-apply/patch:183: trailing whitespace.
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging compiler/pgenutil.pas
Applying: Bug with nested const params
Applying: bug with const param validation
Applying: Fixed bug in type constraints, added templates for non-int consts
Using index info to reconstruct a base tree...
M compiler/pgenutil.pas
M compiler/symconst.pas
M compiler/symdef.pas
M compiler/symsym.pas
.git/rebase-apply/patch:287: trailing whitespace.
end;
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging compiler/symsym.pas
Auto-merging compiler/symdef.pas
CONFLICT (content): Merge conflict in compiler/symdef.pas
Auto-merging compiler/symconst.pas
Auto-merging compiler/pgenutil.pas
error: Failed to merge in the changes.
Patch failed at 0005 Fixed bug in type constraints, added templates for non-int consts
Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Ryans-MacBook-Pro-2:fpc-git ryanjoseph$ git log --graph
* commit da9b3b7b87fccc8a89a4c7b09e00b59a445f6317 (HEAD)
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 19:55:24 2018 +0700
|
| bug with const param validation
|
* commit 8d0de2119f410d67be9f21bec01ac9ed962dee70
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 15:53:53 2018 +0700
|
| Bug with nested const params
|
* commit e34aaf737ed0c3215c6111bbdc2e34dd13fdefe0
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 11:18:32 2018 +0700
|
| Added const for params, disabled in mode delphi
|
* commit 01ca2a741cb8fd18cff918f9c5ec3f2d3be74ca9
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 6 13:58:49 2018 +0700
|
| first commit
|
* commit ab87004ea8bbe6e8ac56835f6c8186b45173dd0f (upstream/master, master)
| Author: Mattias Gaertner <nc-gaertnma at netcologne.de>
:...skipping...
* commit da9b3b7b87fccc8a89a4c7b09e00b59a445f6317 (HEAD)
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 19:55:24 2018 +0700
|
| bug with const param validation
|
* commit 8d0de2119f410d67be9f21bec01ac9ed962dee70
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 15:53:53 2018 +0700
|
| Bug with nested const params
|
* commit e34aaf737ed0c3215c6111bbdc2e34dd13fdefe0
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 11:18:32 2018 +0700
|
| Added const for params, disabled in mode delphi
|
* commit 01ca2a741cb8fd18cff918f9c5ec3f2d3be74ca9
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 6 13:58:49 2018 +0700
|
| first commit
|
* commit ab87004ea8bbe6e8ac56835f6c8186b45173dd0f (upstream/master, master)
| Author: Mattias Gaertner <nc-gaertnma at netcologne.de>
| Date: Sat Jul 20 18:22:00 2019 +0000
:
* commit da9b3b7b87fccc8a89a4c7b09e00b59a445f6317 (HEAD)
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 19:55:24 2018 +0700
|
| bug with const param validation
|
* commit 8d0de2119f410d67be9f21bec01ac9ed962dee70
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 15:53:53 2018 +0700
|
| Bug with nested const params
|
* commit e34aaf737ed0c3215c6111bbdc2e34dd13fdefe0
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 11:18:32 2018 +0700
|
| Added const for params, disabled in mode delphi
|
* commit 01ca2a741cb8fd18cff918f9c5ec3f2d3be74ca9
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 6 13:58:49 2018 +0700
|
| first commit
|
* commit ab87004ea8bbe6e8ac56835f6c8186b45173dd0f (upstream/master, master)
| Author: Mattias Gaertner <nc-gaertnma at netcologne.de>
| Date: Sat Jul 20 18:22:00 2019 +0000
:...skipping...
* commit da9b3b7b87fccc8a89a4c7b09e00b59a445f6317 (HEAD)
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 19:55:24 2018 +0700
|
| bug with const param validation
|
* commit 8d0de2119f410d67be9f21bec01ac9ed962dee70
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 15:53:53 2018 +0700
|
| Bug with nested const params
|
* commit e34aaf737ed0c3215c6111bbdc2e34dd13fdefe0
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 11:18:32 2018 +0700
|
| Added const for params, disabled in mode delphi
|
* commit 01ca2a741cb8fd18cff918f9c5ec3f2d3be74ca9
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 6 13:58:49 2018 +0700
|
| first commit
|
* commit ab87004ea8bbe6e8ac56835f6c8186b45173dd0f (upstream/master, master)
| Author: Mattias Gaertner <nc-gaertnma at netcologne.de>
| Date: Sat Jul 20 18:22:00 2019 +0000
|
| fcl-passrc: fixed parsing generic function after type section
:...skipping...
* commit da9b3b7b87fccc8a89a4c7b09e00b59a445f6317 (HEAD)
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 19:55:24 2018 +0700
|
| bug with const param validation
|
* commit 8d0de2119f410d67be9f21bec01ac9ed962dee70
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 15:53:53 2018 +0700
|
| Bug with nested const params
|
* commit e34aaf737ed0c3215c6111bbdc2e34dd13fdefe0
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 11:18:32 2018 +0700
|
| Added const for params, disabled in mode delphi
|
* commit 01ca2a741cb8fd18cff918f9c5ec3f2d3be74ca9
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 6 13:58:49 2018 +0700
|
| first commit
|
* commit ab87004ea8bbe6e8ac56835f6c8186b45173dd0f (upstream/master, master)
| Author: Mattias Gaertner <nc-gaertnma at netcologne.de>
| Date: Sat Jul 20 18:22:00 2019 +0000
|
| fcl-passrc: fixed parsing generic function after type section
|
:...skipping...
* commit da9b3b7b87fccc8a89a4c7b09e00b59a445f6317 (HEAD)
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 19:55:24 2018 +0700
|
| bug with const param validation
|
* commit 8d0de2119f410d67be9f21bec01ac9ed962dee70
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 15:53:53 2018 +0700
|
| Bug with nested const params
|
* commit e34aaf737ed0c3215c6111bbdc2e34dd13fdefe0
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Thu Nov 8 11:18:32 2018 +0700
|
| Added const for params, disabled in mode delphi
|
* commit 01ca2a741cb8fd18cff918f9c5ec3f2d3be74ca9
| Author: Ryan Joseph <genericptr at gmail.com>
| Date: Tue Nov 6 13:58:49 2018 +0700
|
| first commit
|
* commit ab87004ea8bbe6e8ac56835f6c8186b45173dd0f (upstream/master, master)
| Author: Mattias Gaertner <nc-gaertnma at netcologne.de>
| Date: Sat Jul 20 18:22:00 2019 +0000
|
| fcl-passrc: fixed parsing generic function after type section
|
| git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@42468 3ad0048d-3df7-0310-abae-a5850022a9f2
|
* commit e36d456d5cba95ba586375bc8bc3152590601f72 (graemeg/master)
| Author: Marco van de Voort <marcov at stack.nl>
| Date: Sat Jul 20 14:40:34 2019 +0000
|
| * lookup property published but not stored. Doesn't change much, but less trouble when opening/dualmaintaining delphi forms.
|
| git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@42467 3ad0048d-3df7-0310-abae-a5850022a9f2
Regards,
Ryan Joseph
More information about the fpc-devel
mailing list